Mojo bindings: Fix typemap includes.

mojo/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',
   ],
   'target_defaults' : {
     'include_dirs': [
       '..',
     ],
   },
+  'variables': {
+    'mojo_public_test_interfaces_mojom_files': [
+      'public/interfaces/bindings/tests/math_calculator.mojom',
+      'public/interfaces/bindings/tests/no_module.mojom',
+      'public/interfaces/bindings/tests/ping_service.mojom',
+      'public/interfaces/bindings/tests/rect.mojom',
+      'public/interfaces/bindings/tests/regression_tests.mojom',
+      'public/interfaces/bindings/tests/sample_factory.mojom',
+      'public/interfaces/bindings/tests/sample_import.mojom',
+      'public/interfaces/bindings/tests/sample_import2.mojom',
+      'public/interfaces/bindings/tests/sample_interfaces.mojom',
+      'public/interfaces/bindings/tests/sample_service.mojom',
+      'public/interfaces/bindings/tests/scoping.mojom',
+      'public/interfaces/bindings/tests/serialization_test_structs.mojom',
+      'public/interfaces/bindings/tests/test_constants.mojom',
+      'public/interfaces/bindings/tests/test_native_types.mojom',
+      'public/interfaces/bindings/tests/test_structs.mojom',
+      'public/interfaces/bindings/tests/test_sync_methods.mojom',
+      'public/interfaces/bindings/tests/test_unions.mojom',
+      'public/interfaces/bindings/tests/validation_test_interfaces.mojom',
+    ]
+  },
   'targets': [
     {
       'target_name': 'mojo_public',
       'type': 'none',
       'dependencies': [
         'mojo_js_bindings',
         'mojo_public_test_interfaces',
         'mojo_public_test_utils',
         'mojo_system',
       ],
@@ skipping 326 matching lines @@
       ],
       'sources': [
         'public/cpp/bindings/tests/validation_test_input_parser.cc',
         'public/cpp/bindings/tests/validation_test_input_parser.h',
       ],
     },
     {
       'target_name': 'mojo_public_test_interfaces_mojom',
       'type': 'none',
       'variables': {
-        'mojom_files': [
-          'public/interfaces/bindings/tests/math_calculator.mojom',
-          'public/interfaces/bindings/tests/no_module.mojom',
-          'public/interfaces/bindings/tests/ping_service.mojom',
-          'public/interfaces/bindings/tests/rect.mojom',
-          'public/interfaces/bindings/tests/regression_tests.mojom',
-          'public/interfaces/bindings/tests/sample_factory.mojom',
-          'public/interfaces/bindings/tests/sample_import.mojom',
-          'public/interfaces/bindings/tests/sample_import2.mojom',
-          'public/interfaces/bindings/tests/sample_interfaces.mojom',
-          'public/interfaces/bindings/tests/sample_service.mojom',
-          'public/interfaces/bindings/tests/scoping.mojom',
-          'public/interfaces/bindings/tests/serialization_test_structs.mojom',
-          'public/interfaces/bindings/tests/test_constants.mojom',
-          'public/interfaces/bindings/tests/test_structs.mojom',
-          'public/interfaces/bindings/tests/test_sync_methods.mojom',
-          'public/interfaces/bindings/tests/test_unions.mojom',
-          'public/interfaces/bindings/tests/validation_test_interfaces.mojom',
-        ],
+        'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
       },
       'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
     },
     {
       'target_name': 'mojo_public_test_interfaces_struct_traits',
       'type': 'static_library',
       'variables': {
         'mojom_extra_generator_args': [
           '--typemap', '<(DEPTH)/mojo/public/interfaces/bindings/tests/struct_with_traits.typemap',
         ],
       },
       'sources': [
         'public/interfaces/bindings/tests/struct_with_traits.mojom',
       ],
       'includes': [ 'mojom_bindings_generator.gypi' ],
     },
     {
       'target_name': 'mojo_public_test_interfaces_mojom_blink',
       'type': 'none',
       'variables': {
         'mojom_variant': 'blink',
         'mojom_extra_generator_args': [
           '--typemap', '<(DEPTH)/mojo/public/interfaces/bindings/tests/blink_test.typemap',
         ],
-        'mojom_files': [
-          'public/interfaces/bindings/tests/test_native_types.mojom',
-        ],
+        'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
       },
       'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
       'dependencies': [
         'mojo_public_test_interfaces_mojom',
       ],
     },
     {
       'target_name': 'mojo_public_test_interfaces_mojom_chromium',
       'type': 'none',
       'variables': {
         'mojom_variant': 'chromium',
         'mojom_extra_generator_args': [
           '--typemap', '<(DEPTH)/mojo/public/interfaces/bindings/tests/chromium_test.typemap',
         ],
-        'mojom_files': [
-          'public/interfaces/bindings/tests/test_native_types.mojom',
-        ],
+        'mojom_files': '<(mojo_public_test_interfaces_mojom_files)',
       },
       'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
       'dependencies': [
         'mojo_public_test_interfaces_mojom',
       ],
     },
     {
       # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
       'target_name': 'mojo_public_test_interfaces',
       'type': 'static_library',
@@ skipping 120 matching lines @@
              'mojo_interface_bindings_java_sources',
              'mojo_public_java',
              '<(DEPTH)/base/base.gyp:base_java',
            ],
            'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
   ],
 }