Implement ServiceManager

mojo/mojo_services.gypi

Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 983d69f1ec447ec957719715b274432be03dd0f3..53550b4c753388a661aadd5614a844f55a1f9371 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -45,22 +45,21 @@
     },
     {
       'target_name': 'mojo_native_viewport_service',
-      'type': 'static_library',
+      'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         'mojo_gles2_service',
         'mojo_native_viewport_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_native_viewport_bindings',
+        'shell_bindings',
       ],
       'sources': [
+        'services/native_viewport/android/mojo_viewport.cc',
+        'services/native_viewport/android/mojo_viewport.h',

[abarth-chromium, 2013/12/10 01:06:03]

This looks like a bad merge.  This code doesn't exist anymore.

[DaveMoore, 2013/12/10 03:00:45]

Done.

         'services/native_viewport/native_viewport.h',
         'services/native_viewport/native_viewport_android.cc',
         'services/native_viewport/native_viewport_impl.cc',
-        'services/native_viewport/native_viewport_impl.h',
         'services/native_viewport/native_viewport_mac.mm',
         'services/native_viewport/native_viewport_stub.cc',
         'services/native_viewport/native_viewport_win.cc',