Refactor bindings generation in GYP

mojo/public/mojo_public.gyp

 # 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.
 
 {
   'includes': [
     '../mojo_variables.gypi',
   ],
   'targets': [
     {
@@ skipping 168 matching lines @@
             'cpp/utility/lib/mutex.cc',
             'cpp/utility/lib/thread.cc',
           ],
         }],
       ],
       'include_dirs': [
         '../..',
       ],
     },
     {
+      'target_name': 'mojo_application_bindings_mojom',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'interfaces/application/application.mojom',
+          'interfaces/application/service_provider.mojom',
+          'interfaces/application/shell.mojom',
+        ],
+      },
+      'includes': [ 'tools/bindings/mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
       # GN version: //mojo/public/interfaces/application:application
       'target_name': 'mojo_application_bindings',
       'type': 'static_library',
-      'sources': [
-        'interfaces/application/application.mojom',
-        'interfaces/application/service_provider.mojom',
-        'interfaces/application/shell.mojom',
-      ],
-      'includes': [ 'tools/bindings/mojom_bindings_generator.gypi' ],
       'dependencies': [
+        'mojo_application_bindings_mojom',
         'mojo_cpp_bindings',
       ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
     },
     {
       # GN version: //mojo/public/cpp/application
       'target_name': 'mojo_application_base',
       'type': 'static_library',
@@ skipping 95 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '../../base/base.gyp:base',
       ],
       'sources': [
         'cpp/bindings/tests/validation_test_input_parser.cc',
         'cpp/bindings/tests/validation_test_input_parser.h',
       ],
     },
     {
+      'target_name': 'mojo_public_test_interfaces_mojom',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'interfaces/bindings/tests/math_calculator.mojom',
+          'interfaces/bindings/tests/no_module.mojom',
+          'interfaces/bindings/tests/rect.mojom',
+          'interfaces/bindings/tests/regression_tests.mojom',
+          'interfaces/bindings/tests/sample_factory.mojom',
+          'interfaces/bindings/tests/sample_import.mojom',
+          'interfaces/bindings/tests/sample_import2.mojom',
+          'interfaces/bindings/tests/sample_interfaces.mojom',
+          'interfaces/bindings/tests/sample_service.mojom',
+          'interfaces/bindings/tests/serialization_test_structs.mojom',
+          'interfaces/bindings/tests/test_structs.mojom',
+          'interfaces/bindings/tests/validation_test_interfaces.mojom',
+        ],
+      },
+      'includes': [ 'tools/bindings/mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
       # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
       'target_name': 'mojo_public_test_interfaces',
       'type': 'static_library',
-      'sources': [
-        'interfaces/bindings/tests/math_calculator.mojom',
-        'interfaces/bindings/tests/no_module.mojom',
-        'interfaces/bindings/tests/rect.mojom',
-        'interfaces/bindings/tests/regression_tests.mojom',
-        'interfaces/bindings/tests/sample_factory.mojom',
-        'interfaces/bindings/tests/sample_import.mojom',
-        'interfaces/bindings/tests/sample_import2.mojom',
-        'interfaces/bindings/tests/sample_interfaces.mojom',
-        'interfaces/bindings/tests/sample_service.mojom',
-        'interfaces/bindings/tests/serialization_test_structs.mojom',
-        'interfaces/bindings/tests/test_structs.mojom',
-        'interfaces/bindings/tests/validation_test_interfaces.mojom',
-      ],
-      'includes': [ 'tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
       'dependencies': [
+        'mojo_public_test_interfaces_mojom',
         'mojo_cpp_bindings',
       ],
     },
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           # GN version: //mojo/public/java_system
           'target_name': 'mojo_public_java',
@@ skipping 12 matching lines @@
            },
            'dependencies': [
              'mojo_public_java',
            ],
            'includes': [ '../../build/java.gypi' ],
         },
       ],
     }],
   ],
 }