Mojo: Simplify typemap usage.

mojo/mojom_bindings_generator_explicit.gypi

Index: mojo/mojom_bindings_generator_explicit.gypi
diff --git a/mojo/mojom_bindings_generator_explicit.gypi b/mojo/mojom_bindings_generator_explicit.gypi
index 599ee3b4790ba4b0305c6a278d5d4cc0ab126083..4c1f7f8b68592d362c64f2664aa23a41753c5e70 100644
--- a/mojo/mojom_bindings_generator_explicit.gypi
+++ b/mojo/mojom_bindings_generator_explicit.gypi
@@ -12,14 +12,15 @@
       '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"', {
@@ -61,13 +62,26 @@
       ],
       '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',
+      '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',
@@ -82,6 +96,10 @@
         '<@(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)',
@@ -96,7 +114,8 @@
         '--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',