Expose the asset_bundle service in SkyShell

sky/shell/BUILD.gn

Index: sky/shell/BUILD.gn
diff --git a/sky/shell/BUILD.gn b/sky/shell/BUILD.gn
index 64b88ddd26f320392fb8619c2742561d72161d10..183c7817262972f8cbec81d844ed04e39b159741 100644
--- a/sky/shell/BUILD.gn
+++ b/sky/shell/BUILD.gn
@@ -11,18 +11,48 @@ common_deps = [
   "//mojo/edk/system",
   "//mojo/public/cpp/application",
   "//mojo/public/interfaces/application",
+  "//mojo/services/asset_bundle/public/interfaces",
   "//mojo/services/navigation/public/interfaces",
   "//mojo/services/network/public/interfaces",
+  "//services/asset_bundle:lib",
   "//skia",
   "//sky/engine",
-  "//sky/engine/wtf",
   "//sky/engine/tonic",
+  "//sky/engine/wtf",
   "//sky/services/platform",
   "//sky/services/viewport",
   "//ui/gfx/geometry",
   "//ui/gl",
 ]
 
+common_files = [
+  "gpu/ganesh_context.cc",
+  "gpu/ganesh_context.h",
+  "gpu/ganesh_surface.cc",
+  "gpu/ganesh_surface.h",
+  "gpu/rasterizer.cc",
+  "gpu/rasterizer.h",
+  "gpu_delegate.cc",
+  "gpu_delegate.h",
+  "platform_view.cc",
+  "platform_view.h",
+  "service_provider.h",
+  "shell.cc",
+  "shell.h",
+  "shell_view.cc",
+  "shell_view.h",
+  "ui/animator.cc",
+  "ui/animator.h",
+  "ui/engine.cc",
+  "ui/engine.h",
+  "ui/input_event_converter.cc",
+  "ui/input_event_converter.h",
+  "ui/internals.cc",
+  "ui/internals.h",
+  "ui_delegate.cc",
+  "ui_delegate.h",
+]
+
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ -39,41 +69,16 @@ if (is_android) {
 
   shared_library("sky_shell") {
     sources = [
-      "android/library_loader.cc",
-      "android/platform_service_provider_android.cc",
-      "android/platform_service_provider_android.h",
-      "android/platform_view_android.cc",
-      "android/platform_view_android.h",
-      "android/sky_main.cc",
-      "android/sky_main.h",
-      "android/tracing_controller.cc",
-      "android/tracing_controller.h",
-      "gpu/ganesh_context.cc",
-      "gpu/ganesh_context.h",
-      "gpu/ganesh_surface.cc",
-      "gpu/ganesh_surface.h",
-      "gpu/rasterizer.cc",
-      "gpu/rasterizer.h",
-      "gpu_delegate.cc",
-      "gpu_delegate.h",
-      "platform_view.cc",
-      "platform_view.h",
-      "service_provider.h",
-      "shell.cc",
-      "shell.h",
-      "shell_view.cc",
-      "shell_view.h",
-      "ui/animator.cc",
-      "ui/animator.h",
-      "ui/engine.cc",
-      "ui/engine.h",
-      "ui/input_event_converter.cc",
-      "ui/input_event_converter.h",
-      "ui/internals.cc",
-      "ui/internals.h",
-      "ui_delegate.cc",
-      "ui_delegate.h",
-    ]
+                "android/library_loader.cc",
+                "android/platform_service_provider_android.cc",
+                "android/platform_service_provider_android.h",
+                "android/platform_view_android.cc",
+                "android/platform_view_android.h",
+                "android/sky_main.cc",
+                "android/sky_main.h",
+                "android/tracing_controller.cc",
+                "android/tracing_controller.h",
+              ] + common_files

[eseidel, 2015/06/22 15:59:43]

Why use a variable instead of a source set?

 
     deps = common_deps + [
              "//mojo/android:libsystem_java",
@@ -135,41 +140,18 @@ if (is_android) {
 
     source_set(scaffolding_target) {
       sources = [
-        "gpu/ganesh_context.cc",
-        "gpu/ganesh_context.h",
-        "gpu/ganesh_surface.cc",
-        "gpu/ganesh_surface.h",
-        "gpu/rasterizer.cc",
-        "gpu/rasterizer.h",
-        "gpu_delegate.cc",
-        "gpu_delegate.h",
-        "ios/main_ios.mm",
-        "ios/platform_service_provider_ios.cc",
-        "ios/platform_view_ios.h",
-        "ios/platform_view_ios.mm",
-        "ios/sky_app_delegate.h",
-        "ios/sky_app_delegate.mm",
-        "ios/sky_surface.h",
-        "ios/sky_surface.mm",
-        "ios/sky_view_controller.h",
-        "ios/sky_view_controller.mm",
-        "platform_view.cc",
-        "platform_view.h",
-        "shell.cc",
-        "shell.h",
-        "shell_view.cc",
-        "shell_view.h",
-        "ui/animator.cc",
-        "ui/animator.h",
-        "ui/engine.cc",
-        "ui/engine.h",
-        "ui/input_event_converter.cc",
-        "ui/input_event_converter.h",
-        "ui/internals.cc",
-        "ui/internals.h",
-        "ui_delegate.cc",
-        "ui_delegate.h",
-      ]
+                  "ios/main_ios.mm",
+                  "ios/platform_service_provider_ios.cc",
+                  "ios/platform_view_ios.h",
+                  "ios/platform_view_ios.mm",
+                  "ios/sky_app_delegate.h",
+                  "ios/sky_app_delegate.mm",
+                  "ios/sky_surface.h",
+                  "ios/sky_surface.mm",
+                  "ios/sky_view_controller.h",
+                  "ios/sky_view_controller.mm",
+                  "platform_view.cc",
+                ] + common_files
 
       ios_deps = [ "//sky/services/ns_net" ]