Mojo: Simplify typemap usage.

mojo/mojom_bindings_generator_explicit.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.
 
 {
   'includes': [
     'mojom_bindings_generator_variables.gypi',
   ],
   'variables': {
     'variables': {
       'mojom_variant%': 'none',
       'for_blink%': 'false',
     },
     'mojom_variant%': '<(mojom_variant)',
+    'mojom_typemaps%': [],
     'for_blink%': '<(for_blink)',
     'mojom_base_output_dir':
         '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
     'mojom_generated_outputs': [
       '<!@(python <(DEPTH)/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) --variant <(mojom_variant) <@(mojom_files))',
     ],
+    'mojom_typemap_file': '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(_target_name)__type_mappings',
     'mojom_include_path%': '<(DEPTH)',
-    'mojom_extra_generator_args%': [],
     'require_interface_bindings%': 1,
     'conditions': [
       ['mojom_variant=="none"', {
         'mojom_output_languages%': 'c++,javascript,java',
       }, {
         'mojom_output_languages%': 'c++',
       }],
       ['for_blink=="true"', {
         'mojom_generator_wtf_arg%': [
           '--for_blink',
@@ skipping 21 matching lines @@
       'action_name': '<(_target_name)_mojom_bindings_stamp',
       # The java output directory is deleted to ensure that the java library
       # doesn't try to compile stale files.
       'action': [
         'python', '<(DEPTH)/build/rmdir_and_stamp.py',
         '<(java_out_dir)',
         '<(stamp_filename)',
       ],
       'inputs': [
         '<@(mojom_files)',
-        '<(SHARED_INTERMEDIATE_DIR)/mojo/public/tools/bindings/cpp_templates.zip',
-        '<(SHARED_INTERMEDIATE_DIR)/mojo/public/tools/bindings/java_templates.zip',
-        '<(SHARED_INTERMEDIATE_DIR)/mojo/public/tools/bindings/js_templates.zip',
       ],
       'outputs': [ '<(stamp_filename)' ],
     },
     {
+      'variables': {
+        'output': '<(mojom_typemap_file)',
+      },
+      'action_name': '<(_target_name)__type_mappings',

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

nit: it seems a little inconsistent to use "__" (two chars) here because we only
use one for things like '<(_target_name)_mojom_bindings_generator'.

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

Done.

+      'action': [
+        'python', '<(DEPTH)/mojo/public/tools/bindings/generate_type_mappings.py',
+        '--output',
+        '<(output)',
+        '<!@(python <(DEPTH)/mojo/public/tools/bindings/format_typemap_generator_args.py <@(mojom_typemaps))',
+      ],
+      'inputs':[
+        '<(DEPTH)/mojo/public/tools/bindings/generate_type_mappings.py',
+      ],
+      'outputs': [ '<(output)' ],
+    },
+    {
       'action_name': '<(_target_name)_mojom_bindings_generator',
       'variables': {
         'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
         'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_name).stamp',
         'mojom_import_args%': [
          '-I<(DEPTH)',
          '-I<(DEPTH)/mojo/services',
          '-I<(mojom_include_path)',
         ],
       },
       'inputs': [
         '<@(mojom_bindings_generator_sources)',
         '<@(mojom_files)',
         '<(stamp_filename)',
+        '<(mojom_typemap_file)',
+        '<(SHARED_INTERMEDIATE_DIR)/mojo/public/tools/bindings/cpp_templates.zip',
+        '<(SHARED_INTERMEDIATE_DIR)/mojo/public/tools/bindings/java_templates.zip',
+        '<(SHARED_INTERMEDIATE_DIR)/mojo/public/tools/bindings/js_templates.zip',
       ],
       'outputs': [
         '<@(mojom_generated_outputs)',
       ],
       'action': [
         'python', '<@(mojom_bindings_generator)',
         '--use_bundled_pylibs', 'generate',
         '<@(mojom_files)',
         '-d', '<(DEPTH)',
         '<@(mojom_import_args)',
         '-o', '<(SHARED_INTERMEDIATE_DIR)',
         '--java_output_directory=<(java_out_dir)',
         '--variant', '<(mojom_variant)',
         '-g', '<(mojom_output_languages)',
-        '<@(mojom_extra_generator_args)',
+        '--typemap',
+        '<(mojom_typemap_file)',
         '<@(mojom_generator_wtf_arg)',
         '--bytecode_path',
         '<(SHARED_INTERMEDIATE_DIR)/mojo/public/tools/bindings',
       ],
       'message': 'Generating Mojo bindings from <@(mojom_files)',
     }
   ],
   'conditions': [
     ['require_interface_bindings==1', {
       'dependencies': [
@@ skipping 41 matching lines @@
         ],
         'additional_input_paths': [
           '<@(mojom_bindings_generator_sources)',
           '<@(mojom_files)',
         ],
         'mojom_generated_sources': [ '<@(mojom_generated_outputs)' ],
       },
     }
   },
 }