Implement ServiceManager

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index b82901186d7fe40680bcef1c71e19b19ada81bbf..b24ef967d6dc0e61ab53c44df0070b364a6cbe2d 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -248,12 +248,11 @@
         'mojo_bindings',
         'mojo_gles2_impl',
         'mojo_native_viewport_service',
+        'mojo_shell_bindings',
         'mojo_system',
         'mojo_system_impl',
       ],
       'sources': [
-        'shell/app_container.cc',
-        'shell/app_container.h',
         'shell/context.cc',
         'shell/context.h',
         'shell/init.cc',
@@ -266,6 +265,8 @@
         'shell/run.h',
         'shell/storage.cc',
         'shell/storage.h',
+        'shell/service_manager.cc',
+        'shell/service_manager.h',
         'shell/switches.cc',
         'shell/switches.h',
         'shell/task_runners.cc',
@@ -283,6 +284,18 @@
       ],
     },
     {
+      'target_name': 'mojo_shell_bindings',
+      'type': 'static_library',
+      'sources': [
+        'shell/shell.mojom',
+      ],
+      'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
+      'export_dependent_settings': [
+        'mojo_bindings',
+        'mojo_system',
+      ],
+    },
+    {
       'target_name': 'mojo_shell',
       'type': 'executable',
       'dependencies': [
@@ -361,6 +374,8 @@
             'mojo_common_lib',
             'mojo_jni_headers',
             'mojo_shell_lib',
+            'mojo_shell_bindings',
+            'mojo_native_viewport_service',
           ],
           'sources': [
             'shell/android/library_loader.cc',