diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 09:02:37 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 09:02:37 +0000 |
| commit | 0512e467f991e91c98c77722e057a6df1e97fd63 (patch) | |
| tree | 32e1bb1fb0b39a8ecab9c239982cf7b269e70c85 /build/gyp_chromium | |
| parent | f14d234f5c530831922edce1408a5f5522be5c8f (diff) | |
| download | chromium_src-0512e467f991e91c98c77722e057a6df1e97fd63.zip chromium_src-0512e467f991e91c98c77722e057a6df1e97fd63.tar.gz chromium_src-0512e467f991e91c98c77722e057a6df1e97fd63.tar.bz2 | |
GN iOS build fixes.
This properly sets the DEPLOYMENT_TARGET in the generated GYP file (previously this value wa salways hardcoded to empty -- whoops!).
Sets the simulator properly. Previously when not using an explicit SDK the Xcode generator would still end up with a simulator build. This turns the flag into a tri-state so gyp_chromium can set it explicitly when an SDK is specified, but otherwise we can trigger default behavior based on Xcode/Ninja.
TBR=scottmg
Review URL: https://codereview.chromium.org/155983003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index 9353752..6ab07d6 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -233,14 +233,14 @@ def GetArgsStringForGN(supplemental_files): if 'gomadir' in vars_dict: gn_args += ' goma_dir=%s' % EscapeStringForGN(vars_dict['gomadir']) - # Clear the "use_ios_simulator" flag if the ios_sdk_path is set and is - # not a simulator SDK. This duplicates code done in GYP's xcode emulation. + # Set the "use_ios_simulator" flag if the ios_sdk_path is set. if 'ios_sdk_path' in vars_dict: - if not os.path.basename(vars_dict['ios_sdk_path']).lower().startswith( + if os.path.basename(vars_dict['ios_sdk_path']).lower().startswith( 'iphonesimulator'): + gn_args += ' use_ios_simulator=true' + else: gn_args += ' use_ios_simulator=false' - # These arguments get passed directly as integers (avoiding the quoting and # escaping of the string ones above). for v in ['arm_version']: |