Second attempt to land change to remove NativeViewportService and

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 72c13df34bce53f281f3887d2630c348c40ea8ea..3658964189803759336ee9b0dd5a1ca3d5dce8f5 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -38,7 +38,7 @@
         'mojo_geometry_lib',
         'mojo_html_viewer',
         'mojo_js',
-        'mojo_native_viewport_service_lib',
+        'mojo_native_viewport_service',
         'mojo_network_service',
         'mojo_pepper_container_app',
         'mojo_png_viewer',
@@ -146,8 +146,6 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../net/net.gyp:net',
-        '../url/url.gyp:url_lib',
         'mojo_application_manager',
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_base.gyp:mojo_common_lib',
@@ -155,7 +153,6 @@
         'mojo_base.gyp:mojo_system_impl',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_external_service_bindings',
-        'mojo_native_viewport_service_lib',
         'mojo_network_bindings',
         'mojo_spy',
       ],
@@ -193,10 +190,13 @@
         'shell/test_child_process.h',
         'shell/ui_application_loader_android.cc',
         'shell/ui_application_loader_android.h',
-        'shell/view_manager_loader.cc',
-        'shell/view_manager_loader.h',
       ],
       'conditions': [
+        ['component=="shared_library"', {
+          'dependencies': [
+            '../ui/gl/gl.gyp:gl',
+          ],
+        }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
@@ -206,25 +206,13 @@
         ['OS=="android"', {
           'dependencies': [
             'mojo_network_service_lib',
+            'mojo_native_viewport_service_lib',
           ],
           'sources': [
             'shell/network_application_loader.cc',
             'shell/network_application_loader.h',
           ],
         }],
-        ['use_aura==1', {
-          'dependencies': [
-            # These are only necessary as long as we hard code use of ViewManager.
-            '../skia/skia.gyp:skia',
-            'mojo_view_manager',
-            'mojo_view_manager_bindings',
-          ],
-        }, {  # use_aura==0
-          'sources!': [
-            'shell/view_manager_loader.cc',
-            'shell/view_manager_loader.h',
-          ],
-        }],
       ],
     },
     {
@@ -232,10 +220,7 @@
       'target_name': 'mojo_shell_test_support',
       'type': 'static_library',
       'dependencies': [
-        '../base/base.gyp:base',
         '../base/base.gyp:base_static',
-        '../url/url.gyp:url_lib',
-        'mojo_application_manager',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_shell_lib',
       ],
@@ -250,24 +235,20 @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
-        '../ui/gl/gl.gyp:gl',
-        '../url/url.gyp:url_lib',
-        'mojo_application_manager',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_base.gyp:mojo_system_impl',
         'mojo_shell_lib',
       ],
+      'sources': [
+        'shell/desktop/mojo_main.cc',
+      ],
       'conditions': [
-        ['use_ozone==1', {
+        ['component=="shared_library"', {

[jamesr, 2014/09/16 19:19:20]

why is this dependency component build only?  if shell/desktop/mojo_main.cc uses
things from ui/gfx/, it should declare the dependency on ui/gfx/ in the static
and component builds. if it doesn't, it shouldn't have a dependency in either

[DaveMoore, 2014/09/16 20:12:37]

I was protecting the call with an #ifdef but not the include. Changed to do that
now.

           'dependencies': [
-            '../ui/ozone/ozone.gyp:ozone',
+            '../ui/gfx/gfx.gyp:gfx',
           ],
         }],
       ],
-      'sources': [
-        'shell/desktop/mojo_main.cc',
-      ],
     },
     {
       # GN version: //mojo/shell:mojo_shell_tests
@@ -279,8 +260,6 @@
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../net/net.gyp:net_test_support',
-        # TODO(vtl): We don't currently need this, but I imagine we will soon.
-        # '../ui/gl/gl.gyp:gl',
         '../url/url.gyp:url_lib',
         'mojo_application_manager',
         'mojo_base.gyp:mojo_common_lib',
@@ -318,7 +297,6 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_content_handler_bindings',
         'mojo_network_bindings',
@@ -480,7 +458,6 @@
             '../ui/compositor/compositor.gyp:compositor',
             '../ui/events/events.gyp:events',
             '../ui/events/events.gyp:events_base',
-            '../ui/gl/gl.gyp:gl',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             'mojo_cc_support',
             'mojo_native_viewport_bindings',