Put thunk targets directly into loadable modules in static build

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 357 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
         '../skia/skia.gyp:skia',
         '../gpu/gpu.gyp:gles2_implementation',
         'mojo_geometry_lib',
         'mojo_surfaces_bindings',
         'mojo_surfaces_lib',
-        '<(mojo_gles2_for_loadable_module)',
+      ],
+      'includes': [
+        'mojo_public_gles2_for_loadable_module.gypi',
       ],
       'export_dependent_settings': [
         'mojo_surfaces_bindings',
       ],
       'sources': [
         'cc/context_provider_mojo.cc',
         'cc/context_provider_mojo.h',
         'cc/output_surface_mojo.cc',
         'cc/output_surface_mojo.h',
       ],
@@ skipping 83 matching lines @@
           '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_native_viewport_bindings',
-            '<(mojo_gles2_for_loadable_module)',
+          ],
+          'includes': [
+            'mojo_public_gles2_for_loadable_module.gypi',
           ],
           '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 117 matching lines @@
             },
           ],
           'dependency': [
             'mojo_python',
           ],
         },
       ],
     }],
   ],
 }