commit 7a5e0f38474a0ab996e038aa42f27c0d152b517e
author Mike Klein <mtklein@chromium.org> Mon Mar 13 09:25:33 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 13 17:21:43 2017 +0000
tree 9d5c6b195cec5a170b6de007f04ba4fd25124ee8
parent c2e9f6d7fbde082c851979254235308c2b6edb65

Add iOS simulator support in GN.

This builds fine on my laptop, but fails to link on the bots,
so I'm leaving out a new Build bot for now.

BUG=skia:6329

Change-Id: I4b33770f13ab9dec914d090b45d9921b19ee2c9d
Reviewed-on: https://skia-review.googlesource.com/9519
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>

gn/BUILD.gn

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 5ccc729..7741354 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -50,7 +50,11 @@
 }
 
 if (is_ios) {
-  ios_sysroot = exec_script("find_ios_sysroot.py", [], "trim string")
+  sdk = "iphoneos"
+  if (target_cpu == "x86" || target_cpu == "x64") {
+    sdk = "iphonesimulator"
+  }
+  ios_sysroot = exec_script("find_ios_sysroot.py", [ sdk ], "trim string")
 }
 
 config("default") {
@@ -190,6 +194,10 @@
     _target = target_cpu
     if (target_cpu == "arm") {
       _target = "armv7"
+    } else if (target_cpu == "x86") {
+      _target = "i386"
+    } else if (target_cpu == "x64") {
+      _target = "x86_64"
     }
     asmflags += [
       "-isysroot",

gn/find_ios_sysroot.py

diff --git a/gn/find_ios_sysroot.py b/gn/find_ios_sysroot.py
index 2d9f8d6..789ae9f 100644
--- a/gn/find_ios_sysroot.py
+++ b/gn/find_ios_sysroot.py
@@ -6,5 +6,8 @@
 # found in the LICENSE file.
 
 import subprocess
+import sys
 
-print subprocess.check_output('xcrun --sdk iphoneos --show-sdk-path'.split())
+(sdk,) = sys.argv[1:]
+
+print subprocess.check_output(['xcrun', '--sdk', sdk, '--show-sdk-path'])