Reland r57812 (Add the new Mac manifest to the application bundle) and remove dummy translations
Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) Also remove the old manifest file and references to translations that are not there yet. The problem with the previous landing attempt was that in Release mode build, the following script was looking for binary files that were not there: build/mac/strip_from_xcode BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences with English descriptions Review URL: http://codereview.chromium.org/3287003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@58366 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
11fdb9b10d
Коммит
5db96f21a2
13
common.gypi
13
common.gypi
|
@ -1155,9 +1155,10 @@
|
|||
['OS=="mac"', {
|
||||
'target_defaults': {
|
||||
'variables': {
|
||||
# This should be 'mac_real_dsym%', but there seems to be a bug
|
||||
# with % in variables that are intended to be set to different
|
||||
# values in different targets, like this one.
|
||||
# These should be 'mac_real_dsym%' and 'mac_strip%', but there
|
||||
# seems to be a bug with % in variables that are intended to be
|
||||
# set to different values in different targets, like these two.
|
||||
'mac_strip': 1, # Strip debugging symbols from the target.
|
||||
'mac_real_dsym': 0, # Fake .dSYMs are fine in most cases.
|
||||
},
|
||||
'mac_bundle': 0,
|
||||
|
@ -1205,7 +1206,8 @@
|
|||
['_mac_bundle', {
|
||||
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
|
||||
}],
|
||||
['_type=="executable" or _type=="shared_library" or _type=="loadable_module"', {
|
||||
['(_type=="executable" or _type=="shared_library" or \
|
||||
_type=="loadable_module") and mac_strip!=0', {
|
||||
'target_conditions': [
|
||||
['mac_real_dsym == 1', {
|
||||
# To get a real .dSYM bundle produced by dsymutil, set the
|
||||
|
@ -1249,7 +1251,8 @@
|
|||
], # postbuilds
|
||||
}], # mac_real_dsym
|
||||
], # target_conditions
|
||||
}], # _type=="executable" or _type=="shared_library" or _type=="loadable_module"
|
||||
}], # (_type=="executable" or _type=="shared_library" or
|
||||
# _type=="loadable_module") and mac_strip!=0
|
||||
], # target_conditions
|
||||
}, # target_defaults
|
||||
}], # OS=="mac"
|
||||
|
|
Загрузка…
Ссылка в новой задаче