Put thunk targets directly into loadable modules in static build

mojo/mojo_examples.gypi

 # 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.
 
 {
   'targets': [
     {
       # GN version: //mojo/examples/echo:client
       'target_name': 'mojo_echo_client',
       'type': 'loadable_module',
@@ skipping 56 matching lines @@
       # GN version: //mojo/examples/sample_app
       'target_name': 'mojo_sample_app',
       'type': 'loadable_module',
       'dependencies': [
         'mojo_base.gyp:mojo_application_standalone',
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_base.gyp:mojo_utility',
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_native_viewport_bindings',
-        '<(mojo_gles2_for_loadable_module)',
         '<(mojo_system_for_loadable_module)',
       ],
+      'includes': [
+        'mojo_public_gles2_for_loadable_module.gypi',
+      ],
       'sources': [
         'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/sample_app.cc',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
       ],
     },
     {
       'target_name': 'package_mojo_sample_app',
@@ skipping 67 matching lines @@
         '../cc/cc.gyp:cc',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_cc_support',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gpu_bindings',
         'mojo_native_viewport_bindings',
-        '<(mojo_gles2_for_loadable_module)',
         '<(mojo_system_for_loadable_module)',
       ],
+      'includes': [
+        'mojo_public_gles2_for_loadable_module.gypi',
+      ],
       'sources': [
         'examples/compositor_app/compositor_app.cc',
         'examples/compositor_app/compositor_host.cc',
         'examples/compositor_app/compositor_host.h',
       ],
     },
     {
       'target_name': 'package_mojo_compositor_app',
       'variables': {
         'app_name': 'mojo_compositor_app',
@@ skipping 78 matching lines @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../gpu/gpu.gyp:command_buffer_common',
         '../ppapi/ppapi.gyp:ppapi_c',
         '../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
         '../ui/events/events.gyp:events_base',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_native_viewport_bindings',
-        '<(mojo_gles2_for_loadable_module)',
         '<(mojo_system_for_loadable_module)',
       ],
+      'includes': [
+        'mojo_public_gles2_for_loadable_module.gypi',
+      ],
       'defines': [
         # We don't really want to export. We could change how
         # ppapi_{shared,thunk}_export.h are defined to avoid this.
         'PPAPI_SHARED_IMPLEMENTATION',
         'PPAPI_THUNK_IMPLEMENTATION',
       ],
       'sources': [
         # Source files from ppapi/.
         # An alternative is to depend on
         # '../ppapi/ppapi_internal.gyp:ppapi_shared', but that target includes
@@ skipping 154 matching lines @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gpu_bindings',
         'mojo_surfaces_app_bindings',
         'mojo_surfaces_bindings',
         'mojo_surfaces_lib',
-        '<(mojo_gles2_for_loadable_module)',
         '<(mojo_system_for_loadable_module)',
       ],
+      'includes': [
+        'mojo_public_gles2_for_loadable_module.gypi',
+      ],
       'sources': [
         'examples/surfaces_app/child_gl_app.cc',
         'examples/surfaces_app/child_gl_impl.cc',
         'examples/surfaces_app/child_gl_impl.h',
         'examples/surfaces_app/surfaces_util.cc',
         'examples/surfaces_app/surfaces_util.h',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
       ],
     }
@@ skipping 85 matching lines @@
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_view_manager_bindings',
-            '<(mojo_gles2_for_loadable_module)',
             '<(mojo_system_for_loadable_module)',
           ],
+          'includes': [
+            'mojo_public_gles2_for_loadable_module.gypi',
+          ],
           'sources': [
             'examples/demo_launcher/demo_launcher.cc',
           ],
         },
         {
           'target_name': 'mojo_keyboard',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc',
@@ skipping 79 matching lines @@
             'mojo_core_window_manager_lib',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_input_events_lib',
             'mojo_keyboard_bindings',
             'mojo_launcher_bindings',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_views_support',
             'mojo_window_manager_bindings',
-            '<(mojo_gles2_for_loadable_module)',
             '<(mojo_system_for_loadable_module)',
           ],
+          'includes': [
+            'mojo_public_gles2_for_loadable_module.gypi',
+          ],
           'sources': [
             'examples/window_manager/debug_panel.h',
             'examples/window_manager/debug_panel.cc',
             'examples/window_manager/window_manager.cc',
           ],
         },
         {
           'target_name': 'mojo_embedded_app',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_window_manager_bindings',
-            '<(mojo_gles2_for_loadable_module)',
             '<(mojo_system_for_loadable_module)',
           ],
+          'includes': [
+            'mojo_public_gles2_for_loadable_module.gypi',
+          ],
           'sources': [
             'examples/embedded_app/embedded_app.cc',
           ],
         },
         {
           'target_name': 'mojo_nesting_app',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_window_manager_bindings',
-            '<(mojo_gles2_for_loadable_module)',
             '<(mojo_system_for_loadable_module)',
           ],
+          'includes': [
+            'mojo_public_gles2_for_loadable_module.gypi',
+          ],
           'sources': [
             'examples/nesting_app/nesting_app.cc',
           ],
         },
         {
           'target_name': 'mojo_media_viewer',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
@@ skipping 133 matching lines @@
           ],
           'sources': [
             'examples/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
 
     }],
   ],
 }