Merge pull request #222 from iansf/ios_build

iOS build is now closer to the Android and Linux builds.  Correctly builds the dart-pkg/packages files so that you don't have to build the Android build to run sky_server.

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" ]
   }
 }
 

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" ]
+  }
 }

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" ]
   }
 }

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" ]