Revert of Third attempt to land change to remove NativeViewportService and

mojo/mojo_services.gypi

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       # GN version: //mojo/services/clipboard/
       'target_name': 'mojo_clipboard',
       'type': 'loadable_module',
@@ skipping 310 matching lines @@
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_gles2_bindings',
         'mojo_geometry_bindings',
         'mojo_input_events_bindings',
         'mojo_surface_id_bindings',
       ],
     },
     {
       # GN version: //mojo/services/native_viewport
       'target_name': 'mojo_native_viewport_service_lib',
+      # This is linked directly into the embedder, so we make it a static_library.
+      # TODO(davemoore): Make this a true service.
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc_surfaces',
         '../skia/skia.gyp:skia',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_common_lib',
@@ skipping 50 matching lines @@
           ],
         }],
         ['use_ozone==1', {
           'dependencies': [
             '../ui/ozone/ozone.gyp:ozone',
           ],
         }],
       ],
     },
     {
-      'target_name': 'mojo_native_viewport_service',
-      'type': 'loadable_module',
-      'dependencies': [
-        'mojo_native_viewport_bindings',
-        'mojo_native_viewport_service_lib',
-        '<(mojo_system_for_loadable_module)',
-      ],
-      'export_dependent_settings': [
-        'mojo_native_viewport_bindings',
-      ],
-      'sources': [
-        'services/native_viewport/main.cc',
-      ],
-    },
-    {
       # GN version: //mojo/services/public/interfaces/navigation
       'target_name': 'mojo_navigation_bindings',
       'type': 'static_library',
       'sources': [
         'services/public/interfaces/navigation/navigation.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
@@ skipping 341 matching lines @@
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
     },
   ],
   'conditions': [
     ['use_aura==1', {
       'targets': [
         {
           # GN version: //mojo/services/view_manager
           'target_name': 'mojo_view_manager',
-          'type': 'loadable_module',
+          'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc_surfaces',
             '../skia/skia.gyp:skia',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/events/events.gyp:events',
             '../ui/events/events.gyp:events_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
-            '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
-            'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_gpu_bindings',
             'mojo_input_events_bindings',
             'mojo_input_events_lib',
             'mojo_native_viewport_bindings',
             'mojo_surfaces_bindings',
             'mojo_surfaces_lib',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
-            'mojo_gpu_bindings',
-            '<(mojo_system_for_loadable_module)',
-            # No direct dependencies, but needed for tests that use the
-            # view_manager.
-            'mojo_native_viewport_service',
+            '<(mojo_system_for_component)',
           ],
           'sources': [
             'services/view_manager/access_policy.h',
             'services/view_manager/access_policy_delegate.h',
             'services/view_manager/connection_manager.cc',
             'services/view_manager/connection_manager.h',
             'services/view_manager/default_access_policy.cc',
             'services/view_manager/default_access_policy.h',
             'services/view_manager/display_manager.cc',
             'services/view_manager/display_manager.h',
             'services/view_manager/ids.h',
             'services/view_manager/main.cc',
             'services/view_manager/server_view.cc',
             'services/view_manager/server_view.h',
             'services/view_manager/server_view_delegate.h',
             'services/view_manager/view_manager_export.h',
             'services/view_manager/view_manager_init_service_context.cc',
             'services/view_manager/view_manager_init_service_context.h',
             'services/view_manager/view_manager_init_service_impl.cc',
             'services/view_manager/view_manager_init_service_impl.h',
             'services/view_manager/view_manager_service_impl.cc',
             'services/view_manager/view_manager_service_impl.h',
             'services/view_manager/window_manager_access_policy.cc',
             'services/view_manager/window_manager_access_policy.h',
           ],
-          'includes': [
-            'mojo_public_gles2_for_loadable_module.gypi',
-          ],
           'defines': [
             'MOJO_VIEW_MANAGER_IMPLEMENTATION',
           ],
         },
         {
           # GN version: //mojo/services/public/cpp/view_manager/lib:run_unittests
           'target_name': 'mojo_view_manager_run_unittests',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
+            '../ui/gl/gl.gyp:gl',
           ],
           'sources': [
             'services/public/cpp/view_manager/lib/view_manager_test_suite.cc',
             'services/public/cpp/view_manager/lib/view_manager_test_suite.h',
             'services/public/cpp/view_manager/lib/view_manager_unittests.cc',
           ],
           'conditions': [
+            ['OS=="linux" or OS=="win"', {
+              'dependencies': [
+                '../third_party/mesa/mesa.gyp:osmesa',
+                'mojo_native_viewport_service_lib',
+              ],
+            }],
             ['use_x11==1', {
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
         {
           # GN version: //mojo/services/view_manager:mojo_view_manager_unittests
           'target_name': 'mojo_view_manager_unittests',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../ui/aura/aura.gyp:aura',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             'mojo_application_manager',
             'mojo_base.gyp:mojo_system_impl',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_input_events_bindings',
             'mojo_input_events_lib',
             'mojo_shell_test_support',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
             'mojo_view_manager_run_unittests',
-            # Included only to force deps for bots.
-            'mojo_native_viewport_service',
-            'mojo_view_manager',
           ],
           'sources': [
             'services/view_manager/test_change_tracker.cc',
             'services/view_manager/test_change_tracker.h',
             'services/view_manager/view_manager_unittest.cc',
           ],
-          'conditions': [
-             ['OS=="win"', {
-               'dependencies': [
-                 '../ui/gfx/gfx.gyp:gfx',
-               ],
-             }],
-           ],
         },
         {
           'target_name': 'package_mojo_view_manager',
           'variables': {
             'app_name': 'mojo_view_manager',
           },
           'includes': [ 'build/package_app.gypi' ],
         },
         {
           # GN version: //mojo/services/window_manager:lib
@@ skipping 31 matching lines @@
             'services/window_manager/main.cc',
           ],
         },
         {
           # GN version: //mojo/services/window_manager:mojo_core_window_manager_unittests
           'target_name': 'mojo_core_window_manager_unittests',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
+            '../ui/gl/gl.gyp:gl',
             'mojo_application_manager',
             'mojo_base.gyp:mojo_system_impl',
             'mojo_base.gyp:mojo_environment_chromium',
             'mojo_core_window_manager_bindings',
             'mojo_shell_test_support',
             'mojo_view_manager_bindings',
             'mojo_view_manager_lib',
           ],
           'sources': [
             'services/window_manager/window_manager_api_unittest.cc',
@@ skipping 10 matching lines @@
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }