Mojo: Simplify typemap usage.

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',
+      'public/interfaces/bindings/tests/test_variant.mojom',
+      'public/interfaces/bindings/tests/test_variant_import.mojom',
     ]
   },
   'targets': [
     {
       'target_name': 'mojo_public',
       'type': 'none',
       'dependencies': [
         'mojo_js_bindings',
         'mojo_public_test_interfaces',
         'mojo_public_test_utils',
@@ skipping 331 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': '<(mojo_public_test_interfaces_mojom_files)',
+        'mojom_files': [
+          'public/interfaces/bindings/tests/test_structs.mojom',
+          'public/interfaces/bindings/tests/test_unions.mojom',
+          'public/interfaces/bindings/tests/validation_test_interfaces.mojom',
+          '<@(mojo_public_test_interfaces_mojom_files)',
+        ],
+        'mojom_typemaps': [
+          'public/cpp/bindings/tests/rect_chromium.typemap',
+          'public/cpp/bindings/tests/test_native_types_chromium.typemap',
+        ],
       },
       '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',
+        'mojom_typemaps': [
+          'public/cpp/bindings/tests/struct_with_traits.typemap',
         ],
       },
       'sources': [
         'public/interfaces/bindings/tests/struct_with_traits.mojom',
+        'public/cpp/bindings/tests/struct_with_traits_impl_traits.cc',
       ],
       '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_variant': 'wtf',
+        'for_blink': 'true',
+        'mojom_typemaps': [
+          'public/cpp/bindings/tests/rect_blink.typemap',
+          'public/cpp/bindings/tests/test_native_types_blink.typemap',
         ],
         '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': '<(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',
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
+      'sources': [
+        'public/cpp/bindings/tests/pickled_struct_chromium.cc',
+      ],
       'dependencies': [
         'mojo_public_test_interfaces_mojom',
         'mojo_cpp_bindings',
       ],
     },
     {
       # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_blink
       'target_name': 'mojo_public_test_interfaces_blink',
       'type': 'static_library',
       'export_dependent_settings': [
+        'mojo_public_test_interfaces_mojom_blink',
         'mojo_cpp_bindings',
       ],
+      'sources': [
+        'public/cpp/bindings/tests/pickled_struct_blink.cc',
+      ],
       'dependencies': [
         'mojo_public_test_interfaces_mojom_blink',
         'mojo_cpp_bindings',
       ],
     },
-    {
-      # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces_chromium
-      'target_name': 'mojo_public_test_interfaces_chromium',
-      'type': 'static_library',
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_public_test_interfaces_mojom_chromium',
-        'mojo_cpp_bindings',
-      ],
-    },
     {
       'target_name': 'mojo_public_test_associated_interfaces_mojom',
       'type': 'none',
       'variables': {
         # These files are not included in the mojo_public_test_interfaces_mojom
         # target because associated interfaces are not supported by all bindings
         # languages yet.
         'mojom_files': [
           'public/interfaces/bindings/tests/test_associated_interfaces.mojom',
           'public/interfaces/bindings/tests/validation_test_associated_interfaces.mojom',
@@ skipping 18 matching lines @@
       'type': 'static_library',
       'sources': [
         'public/interfaces/bindings/tests/test_wtf_types.mojom',
       ],
       'includes': [ 'mojom_bindings_generator.gypi' ],
     },
     {
       'target_name': 'mojo_public_test_wtf_types_blink',
       'type': 'static_library',
       'variables': {
-        'mojom_variant': 'blink',
+        'mojom_variant': 'wtf',
         'for_blink': 'true',
       },
       'sources': [
         'public/interfaces/bindings/tests/test_wtf_types.mojom',
       ],
       'includes': [ 'mojom_bindings_generator.gypi' ],
     },
-    {
-      'target_name': 'mojo_public_test_variant',
-      'type': 'static_library',
-      'variables': {
-        'mojom_variant': 'test_variant',

[yzshen1, 2016/04/05 17:36:14]

Instead of moving them into "mojo_public_test_interfaces_mojom_files", maybe it
makes sense to either:
- let them remain in this target which is an isolated test focusing on the
variant feature; or
- simply delete them, because we should have enough test coverage with other
files in "mojo_public_test_interfaces_mojom_files" being compiled into
"mojo_public_test_interfaces_blink".

WDYT?

[Sam McNally, 2016/04/06 07:02:53]

Deleted them.

-      },
-      'sources': [
-        'public/interfaces/bindings/tests/test_variant_import.mojom',
-        'public/interfaces/bindings/tests/test_variant.mojom',
-      ],
-      'includes': [ 'mojom_bindings_generator.gypi' ],
-    },
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           # GN version: //mojo/public/java:system
           'target_name': 'mojo_public_java',
           'type': 'none',
           'variables': {
             'chromium_code': 0,
@@ skipping 20 matching lines @@
              'mojo_interface_bindings_java_sources',
              'mojo_public_java',
              '<(DEPTH)/base/base.gyp:base_java',
            ],
            'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
   ],
 }