From a9061ef43ea891fa87b61d5f91978351e6ecb3f8 Mon Sep 17 00:00:00 2001
From: Ian Fischer <iansf@google.com>
Date: Wed, 22 Jul 2015 16:23:15 -0700
Subject: [PATCH] Some changes to bring the iOS build closer to the Android and
 Linux builds.

Also fixes a couple of toolchain selection issues.
---
 BUILD.gn              | 16 ++++++----------
 services/sky/BUILD.gn |  6 +++++-
 sky/BUILD.gn          |  8 ++++----
 sky/dist/BUILD.gn     | 12 +++++++++++-
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 3561a7901c589..be6126e445ae0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -5,16 +5,12 @@
 # This target will be built if no target is specified when invoking ninja.
 group("default") {
   testonly = true
-
-  if (is_ios || is_mac) {
-    deps = [
-      "//sky/shell",
-    ]
-  } else {
-    deps = [
-      "//sky",
-      "//services/sky",
-    ]
+  deps = [
+    "//sky",
+  ]
+  if (!is_ios) {
+    # Mojo shell does not exist on ios
+    deps += [ "//services/sky" ]
   }
 }
 
diff --git a/services/sky/BUILD.gn b/services/sky/BUILD.gn
index 41911981206b7..9b77b20a1fb8d 100644
--- a/services/sky/BUILD.gn
+++ b/services/sky/BUILD.gn
@@ -34,7 +34,6 @@ mojo_native_application("sky") {
     "//mojo/common:tracing_impl",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
-    "//mojo/icu",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//mojo/public/cpp/utility",
@@ -58,4 +57,9 @@ mojo_native_application("sky") {
     "//ui/events",
     "//url",
   ]
+
+  if (!is_mac && !is_ios) {
+    # Mac and iOS need to use the system-provided ICU
+    deps += [ "//mojo/icu" ]
+  }
 }
diff --git a/sky/BUILD.gn b/sky/BUILD.gn
index a8c556640bdfe..63dec398e5ce4 100644
--- a/sky/BUILD.gn
+++ b/sky/BUILD.gn
@@ -6,10 +6,10 @@ group("sky") {
   testonly = true
 
   deps = [
-    "//sky/engine/platform:platform_unittests",
-    "//sky/engine/wtf:unittests",
+    "//sky/engine/platform:platform_unittests($host_toolchain)",
+    "//sky/engine/wtf:unittests($host_toolchain)",
     "//sky/sdk/example",
-    "//sky/tools/imagediff",
+    "//sky/tools/imagediff($host_toolchain)",
     "//sky/tools/sky_snapshot($host_toolchain)",
     ":sky_dev",
   ]
@@ -31,7 +31,7 @@ group("sky_dev") {
     deps += [ "//sky/services/activity" ]
   }
 
-  if (is_linux) {
+  if (is_linux || is_ios) {
     deps += [ "//sky/shell" ]
   }
 }
diff --git a/sky/dist/BUILD.gn b/sky/dist/BUILD.gn
index aa169fe8d3cfb..b8105440046b7 100644
--- a/sky/dist/BUILD.gn
+++ b/sky/dist/BUILD.gn
@@ -24,6 +24,14 @@ copy("sky_shell") {
     deps = [
       "//sky/sdk/example/demo_launcher",
     ]
+  } else if (is_ios) {
+    sources = [
+      "$root_build_dir/Sky.app",
+    ]
+
+    deps = [
+      "//sky/shell:shell_struct",
+    ]
   } else {
     sources = [
       "$root_build_dir/sky_shell",
@@ -102,9 +110,11 @@ if (is_android) {
 
 group("dist") {
   deps = [
-    ":sky_shell",
     ":sky_viewer",
   ]
+  if (!is_ios) {
+    deps += [ ":sky_shell" ]
+  }
 
   if (is_android) {
     deps += [ ":sky_sdk" ]