commit 0c3576b9c0c2488c1ce6501c759dafb27921e2c5
author sdefresne <sdefresne@chromium.org> Wed Nov 30 15:58:40 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Dec 01 00:01:29 2016 +0000
tree a2f76caa599ce4ce7abf3d5cdaf76d28f4254427
parent f22990995ac59408caf500dc2698b7a294c1d3e1

[GN] Fix generate Xcode project for macOS to work with Xcode 8.

Overridding ARCHS prevents Xcode 8+ from running the compiled binary
on macOS. In addition avoid hard-coding the version of the SDK to use
(since we do not build with Xcode this value is unused) and instead
mention that the version-less SDK.

BUG=634501

Review-Url: https://codereview.chromium.org/2542613002
Cr-Original-Commit-Position: refs/heads/master@{#435483}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5d7f4cee65382c428e9d08112354a8a9bd496aa9

tools/gn/xcode_writer.cc

diff --git a/tools/gn/xcode_writer.cc b/tools/gn/xcode_writer.cc
index bce396b..09f62db 100644
--- a/tools/gn/xcode_writer.cc
+++ b/tools/gn/xcode_writer.cc
@@ -42,25 +42,6 @@
   return XcodeWriter::WRITER_TARGET_OS_MACOS;
 }
 
-std::string GetArchs(const Args& args) {
-  const Value* target_cpu_value = args.GetArgOverride(variables::kTargetCpu);
-  if (target_cpu_value) {
-    if (target_cpu_value->type() == Value::STRING) {
-      if (target_cpu_value->string_value() == "x86")
-        return "i386";
-      if (target_cpu_value->string_value() == "x64")
-        return "x86_64";
-      if (target_cpu_value->string_value() == "arm")
-        return "armv7";
-      if (target_cpu_value->string_value() == "armv7")
-        return "armv7";
-      if (target_cpu_value->string_value() == "arm64")
-        return "armv64";
-    }
-  }
-  return "x86_64";
-}
-
 std::string GetBuildScript(const std::string& target_name,
                            const std::string& build_path,
                            const std::string& ninja_extra_args) {
@@ -157,8 +138,7 @@
       attributes["TARGETED_DEVICE_FAMILY"] = "1,2";
       break;
     case XcodeWriter::WRITER_TARGET_OS_MACOS:
-      attributes["ARCHS"] = GetArchs(build_settings->build_args());
-      attributes["SDKROOT"] = "macosx10.11";
+      attributes["SDKROOT"] = "macosx";
       break;
   }