Put thunk targets directly into loadable modules in static build

mojo/mojo_examples.gypi

Index: mojo/mojo_examples.gypi
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
index d74449887280608ab3c78f94320356d89e810e37..fcb0ec45a3c117773f31cbc1ef8b0df04181f308 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -74,9 +74,11 @@
         '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',
@@ -164,9 +166,11 @@
         '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',
@@ -265,9 +269,11 @@
         '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.
@@ -442,9 +448,11 @@
         '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',
@@ -550,9 +558,11 @@
             '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',
           ],
@@ -652,9 +662,11 @@
             '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',
@@ -676,9 +688,11 @@
             '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',
           ],
@@ -698,9 +712,11 @@
             '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',
           ],