Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: build/common.gypi

Issue 3287003: Reland r57812 (Add the new Mac manifest to the application bundle) and remove dummy translations (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: one more rebase Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/policy/mac/app-Manifest.plist » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 0fcee01ef6fb6830129eef1b92466588e346458b..fe7a357fe47641cde9fbb02bcab5a9a4ed41d7e2 100644
--- a/build/common.gypi
+++ b/build/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"
« no previous file with comments | « no previous file | chrome/app/policy/mac/app-Manifest.plist » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698