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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/gn/gyp_binary_target_writer.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/gn/gyp_binary_target_writer.cc b/tools/gn/gyp_binary_target_writer.cc index eac09ee..d80616e 100644 --- a/tools/gn/gyp_binary_target_writer.cc +++ b/tools/gn/gyp_binary_target_writer.cc @@ -483,8 +483,10 @@ void GypBinaryTargetWriter::WriteMacFlags(const Target* target, } else { Indent(indent + kExtraIndent) << "'SDKROOT': 'iphoneos',\n"; std::string min_ver = GetIPhoneVersionMin(&flags.cflags); - if (!min_ver.empty()) - Indent(indent + kExtraIndent) << "'IPHONEOS_DEPLOYMENT_TARGET': '',\n"; + if (!min_ver.empty()) { + Indent(indent + kExtraIndent) << "'IPHONEOS_DEPLOYMENT_TARGET': '" + << min_ver << "',\n"; + } } } else { // When doing regular Mac and "host" iOS (which look like regular Mac) |