From 0512e467f991e91c98c77722e057a6df1e97fd63 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 7 Feb 2014 09:02:37 +0000 Subject: 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 --- build/gyp_chromium | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build/gyp_chromium') 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']: -- cgit v1.1