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

Unified Diff: build/common.gypi

Issue 23535007: For iOS, don't override VALID_ARCHS in Debug configuration. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: chunk mismatch Created 7 years, 3 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 | no next file » | 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 b5396c44e36f73396bdccbe76111b9ceea9ccfcf..71bffb6c3df9fcd0d74a756954f15cb989bbcb1f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4659,13 +4659,29 @@
# This block adds *project-wide* configuration settings to each project
# file. It's almost always wrong to put things here. Specify your
# custom |configurations| in target_defaults to add them to targets instead.
- 'Debug': {
- 'xcode_settings': {
- # Enable 'Build Active Architecture Only' for Debug. This
- # avoids a project-level warning in Xcode.
- 'ONLY_ACTIVE_ARCH': 'YES',
- },
- },
+ 'conditions': [
+ ['OS=="ios"', {
+ 'Debug': {
+ 'xcode_settings': {
+ # Enable 'Build Active Architecture Only' for Debug. This
+ # avoids a project-level warning in Xcode.
+ # Note that this configuration uses the default VALID_ARCHS value
+ # because if there is a device connected Xcode sets the active arch
+ # to the arch of the device. In cases where the device's arch is not
+ # in VALID_ARCHS (e.g. iPhone5 is armv7s) Xcode complains because it
+ # can't determine what arch to compile for.
+ 'ONLY_ACTIVE_ARCH': 'YES',
+ },
+ },
+ 'Release': {
+ 'xcode_settings': {
+ # Override VALID_ARCHS and omit armv7s. Otherwise Xcode compiles for
+ # both armv7 and armv7s, doubling the binary size.
+ 'VALID_ARCHS': 'armv7 i386',
Mark Mentovai 2013/09/06 17:38:44 Is this supposed to be a space-separated string in
lliabraa 2013/09/06 18:12:40 Yep
+ },
+ },
+ }],
+ ],
},
'xcode_settings': {
# DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
@@ -4704,8 +4720,6 @@
],
}],
['OS=="ios"', {
- # Just build armv7, until armv7s is correctly tested.
- 'VALID_ARCHS': 'armv7 i386',
# Target both iPhone and iPad.
'TARGETED_DEVICE_FAMILY': '1,2',
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698