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

This apparently fixes the tests. There was a merge conflict with the new
mojo_base.gyp file, and now we should be properly integrated, and
everything needed for the implementation of GLES2 should live in
mojo_base (mirroring mojo_system_impl), while everything about the
thunking goes in mojo_public (mirroring mojo_system).

BUG=386799
First Review URL: https://codereview.chromium.org/413303002

Review URL: https://codereview.chromium.org/448873002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288527 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 64 deletions

diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 611aee0..4eb02a1 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -195,65 +195,6 @@
       ],
     },
     {
-      # GN version: //mojo/public/gles2
-      'target_name': 'mojo_gles2',
-      'type': 'shared_library',
-      'defines': [
-        'MOJO_GLES2_IMPLEMENTATION',
-        'GLES2_USE_MOJO',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies': [
-        '../third_party/khronos/khronos.gyp:khronos_headers'
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-        'defines': [
-          'GLES2_USE_MOJO',
-        ],
-      },
-      'sources': [
-        'public/c/gles2/gles2.h',
-        'public/c/gles2/gles2_export.h',
-        'public/gles2/gles2_private.cc',
-        'public/gles2/gles2_private.h',
-      ],
-      'conditions': [
-        ['OS=="mac"', {
-          'xcode_settings': {
-            # Make it a run-path dependent library.
-            'DYLIB_INSTALL_NAME_BASE': '@loader_path',
-          },
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/services/gles2:interfaces (for files generated from
-      # the mojom file)
-      # GN version: //mojo/services/gles2:bindings
-      'target_name': 'mojo_gles2_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/gles2/command_buffer.mojom',
-        'services/gles2/command_buffer_type_conversions.cc',
-        'services/gles2/command_buffer_type_conversions.h',
-        'services/gles2/mojo_buffer_backing.cc',
-        'services/gles2/mojo_buffer_backing.h',
-      ],
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'export_dependent_settings': [
-        'mojo_base.gyp:mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_base.gyp:mojo_cpp_bindings',
-        '../gpu/gpu.gyp:command_buffer_common',
-      ],
-    },
-    {
       # GN version: //mojo/services/gles2
       'target_name': 'mojo_gles2_service',
       'type': 'static_library',
@@ -263,10 +204,10 @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gl/gl.gyp:gl',
-        'mojo_gles2_bindings',
+        'mojo_base.gyp:mojo_gles2_bindings',
       ],
       'export_dependent_settings': [
-        'mojo_gles2_bindings',
+        'mojo_base.gyp:mojo_gles2_bindings',
       ],
       'sources': [
         'services/gles2/command_buffer_impl.cc',
@@ -286,8 +227,8 @@
       ],
       'dependencies': [
         'mojo_base.gyp:mojo_cpp_bindings',
+        'mojo_base.gyp:mojo_gles2_bindings',
         'mojo_geometry_bindings',
-        'mojo_gles2_bindings',
         'mojo_input_events_bindings',
       ],
     },
@@ -455,9 +396,9 @@
         'mojo_cc_support',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
-        'mojo_gles2',
         'mojo_surfaces_bindings',
         'mojo_surfaces_lib',
+        '<(mojo_gles2_for_loadable_module)',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
@@ -728,12 +669,12 @@
             'mojo_cc_support',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
-            'mojo_gles2',
             'mojo_input_events_bindings',
             'mojo_input_events_lib',
             'mojo_native_viewport_bindings',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
+            '<(mojo_gles2_for_component)',
             '<(mojo_system_for_component)',
           ],
           'sources': [