mojo: Reland "Convert gles2 to the new thunking system."

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 86 matching lines @@
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
     },
     {
-      # GN version: //mojo/gles2
-      'target_name': 'mojo_gles2_impl',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../gpu/gpu.gyp:command_buffer_client',
-        '../gpu/gpu.gyp:command_buffer_common',
-        '../gpu/gpu.gyp:gles2_cmd_helper',
-        '../gpu/gpu.gyp:gles2_implementation',
-        'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_gles2',
-        'mojo_gles2_bindings',
-        '<(mojo_system_for_component)',
-      ],
-      'defines': [
-        'MOJO_GLES2_IMPL_IMPLEMENTATION',
-      ],
-      'sources': [
-        'gles2/command_buffer_client_impl.cc',
-        'gles2/command_buffer_client_impl.h',
-        'gles2/gles2_impl_export.h',
-        'gles2/gles2_support_impl.cc',
-        'gles2/gles2_support_impl.h',
-        'gles2/gles2_context.cc',
-        'gles2/gles2_context.h',
-      ],
-    },
-    {
       'target_name': 'mojo_spy',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
         '../net/net.gyp:http_server',
         '../url/url.gyp:url_lib',
         'mojo_application_manager',
       ],
       'variables': {
@@ skipping 17 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '../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',
+        'mojo_base.gyp:mojo_gles2_impl',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_external_service_bindings',
-        'mojo_gles2_impl',
         'mojo_native_viewport_service',
         'mojo_network_bindings',
         'mojo_spy',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'shell/app_child_process.cc',
         'shell/app_child_process.h',
         'shell/app_child_process.mojom',
         'shell/app_child_process_host.cc',
@@ skipping 45 matching lines @@
           ],
           '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_gles2',
             'mojo_view_manager',
             'mojo_view_manager_bindings',
           ],
         }, {  # use_aura==0
           'sources!': [
             'shell/view_manager_loader.cc',
             'shell/view_manager_loader.h',
           ],
         }],
       ],
@@ skipping 133 matching lines @@
     },
     {
       # GN version: //mojo/cc
       'target_name': 'mojo_cc_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../skia/skia.gyp:skia',
         '../gpu/gpu.gyp:gles2_implementation',
-        'mojo_gles2',
+        '<(mojo_gles2_for_loadable_module)',
       ],
       'sources': [
         'cc/context_provider_mojo.cc',
         'cc/context_provider_mojo.h',
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
@@ skipping 76 matching lines @@
           'type': 'static_library',
           'dependencies': [
             '../cc/cc.gyp:cc',
             '../ui/aura/aura.gyp:aura',
             '../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_gles2',
             'mojo_native_viewport_bindings',
+            '<(mojo_gles2_for_loadable_module)',
           ],
           'sources': [
             'aura/aura_init.cc',
             'aura/aura_init.h',
             'aura/context_factory_mojo.cc',
             'aura/context_factory_mojo.h',
             'aura/screen_mojo.cc',
             'aura/screen_mojo.h',
             'aura/window_tree_host_mojo.cc',
             'aura/window_tree_host_mojo.h',
@@ skipping 45 matching lines @@
             'views/views_init_internal.h',
           ],
           'defines': [
             'MOJO_VIEWS_IMPLEMENTATION',
           ],
         },
       ],
     }],
   ],
 }