diff options
| author | thakis <thakis@chromium.org> | 2016-01-04 08:37:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-04 16:39:19 +0000 |
| commit | ea6bdacc04396d48bd80fc40cf490ad238d88e4d (patch) | |
| tree | bb42383331c65c893a1322b8c371b7eb1ca593d6 /build/common.gypi | |
| parent | 1a77853d763a0473d9fded836a1a55a6aa3b451a (diff) | |
| download | chromium_src-ea6bdacc04396d48bd80fc40cf490ad238d88e4d.zip chromium_src-ea6bdacc04396d48bd80fc40cf490ad238d88e4d.tar.gz chromium_src-ea6bdacc04396d48bd80fc40cf490ad238d88e4d.tar.bz2 | |
Simplify xcode_settings block in common.gypi a bit.
- Mac builds are always 64-bit nowaydays
- Collapse two adjacent OS==ios conditions
No intended behavior change.
BUG=none
Review URL: https://codereview.chromium.org/1557823002
Cr-Commit-Position: refs/heads/master@{#367314}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/build/common.gypi b/build/common.gypi index cbea957..1351edc 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -6373,6 +6373,7 @@ # configured SDK to show properly in the Xcode UI, SDKROOT must be set # here at the project level. ['OS=="mac"', { + 'ARCHS': [ 'x86_64' ], 'conditions': [ ['mac_sdk_path==""', { 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot @@ -6382,6 +6383,8 @@ ], }], ['OS=="ios"', { + # Target both iPhone and iPad. + 'TARGETED_DEVICE_FAMILY': '1,2', 'conditions': [ ['ios_sdk_path==""', { 'conditions': [ @@ -6397,23 +6400,6 @@ }], ], }], - ['OS=="ios"', { - # Target both iPhone and iPad. - 'TARGETED_DEVICE_FAMILY': '1,2', - }, { # OS!="ios" - 'conditions': [ - ['target_arch=="x64"', { - 'ARCHS': [ - 'x86_64' - ], - }], - ['target_arch=="ia32"', { - 'ARCHS': [ - 'i386' - ], - }], - ], - }], ], # The Xcode generator will look for an xcode_settings section at the root |