Revert of mojo: Convert gles2 to the new thunking system

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/dbus_echo:bindings
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
@@ skipping 177 matching lines @@
         'mojo_geometry_lib',
         'mojo_run_all_unittests',
         'mojo_surfaces_bindings',
         'mojo_surfaces_lib',
       ],
       'sources': [
         'services/public/cpp/surfaces/tests/surface_unittest.cc',
       ],
     },
     {
+      # 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',
@@ skipping 458 matching lines @@
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
             'mojo_application',
             'mojo_cc_support',
             'mojo_common_lib',
             'mojo_environment_chromium',
             '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': [
             'public/cpp/application/lib/mojo_main_chromium.cc',
             'services/view_manager/access_policy.h',
             'services/view_manager/access_policy_delegate.h',
             'services/view_manager/default_access_policy.cc',
             'services/view_manager/default_access_policy.h',
             'services/view_manager/window_manager_access_policy.cc',
             'services/view_manager/window_manager_access_policy.h',
@@ skipping 178 matching lines @@
             'mojo_system_impl',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }