Put thunk targets directly into loadable modules in static build

mojo/mojo_apps.gypi

 # Copyright 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/apps/js
       #             //mojo/apps/js/bindings
       #             //mojo/apps/js/bindings/gl
       'target_name': 'mojo_js_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../gin/gin.gyp:gin',
         '../ui/gl/gl.gyp:gl',
         '../v8/tools/gyp/v8.gyp:v8',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_environment_chromium',
         'mojo_base.gyp:mojo_gles2_bindings',
         'mojo_base.gyp:mojo_js_bindings_lib',
         'mojo_native_viewport_bindings',
-        '<(mojo_gles2_for_loadable_module)',
+      ],
+      'includes': [
+        'mojo_public_gles2_for_loadable_module.gypi',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../gin/gin.gyp:gin',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_gles2_bindings',
         'mojo_native_viewport_bindings',
-        '<(mojo_gles2_for_loadable_module)',
       ],
       'sources': [
         'apps/js/mojo_runner_delegate.cc',
         'apps/js/mojo_runner_delegate.h',
         'apps/js/bindings/threading.cc',
         'apps/js/bindings/threading.h',
         'apps/js/bindings/gl/context.cc',
         'apps/js/bindings/gl/context.h',
         'apps/js/bindings/gl/module.cc',
         'apps/js/bindings/gl/module.h',
@@ skipping 59 matching lines @@
             'mojo_apps_js_unittests.isolate',
           ],
           'sources': [
             'mojo_apps_js_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }