Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 91a4d894e99eab1084d06a0819a8555c2c2961f4..841b3825ecb2b406f5d7c348f1e8f2ee8327eec1 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -979,6 +979,7 @@ |
], |
}], # os_posix==1 and OS!="mac" and OS!="ios" |
['OS=="ios"', { |
+ # Features unavailable on ios. |
stuartmorgan
2012/10/05 12:08:45
Remove this; it's not informative, and isn't actua
pkl (ping after 24h if needed)
2012/10/05 15:27:09
Done.
|
'disable_nacl%': 1, |
'enable_gpu%': 0, |
'icu_use_data_file_flag%': 1, |
@@ -990,7 +991,19 @@ |
# sub-builds. This allows the Mac sub-build SDK in an iOS build to be |
# overridden from the command line the same way it is for a Mac build. |
'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py 10.6)', |
- }], |
+ |
+ 'conditions': [ |
+ # ios_product_name is set to the name of the .app bundle as it should |
+ # appear on disk. |
+ ['(branding=="Chrome" and buildtype=="Official")', { |
+ 'ios_breakpad%': 1, |
stuartmorgan
2012/10/05 12:08:45
This doesn't match what we do on Mac; as I mention
pkl (ping after 24h if needed)
2012/10/05 15:27:09
I looked at the find_sdk.py invocation for Mac. It
|
+ 'ios_product_name%': 'Chrome', |
+ }, { # else: branding!="Chrome" |
+ 'ios_breakpad%': 0, |
+ 'ios_product_name%': 'Chromium', |
+ }], |
+ ], |
+ }], # OS=="ios" |
['OS=="android"', { |
# Location of Android NDK. |
'variables': { |