Refactor bindings generation in GYP

mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi

Index: mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi
diff --git a/mojo/public/tools/bindings/mojom_bindings_generator.gypi b/mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi
similarity index 85%
copy from mojo/public/tools/bindings/mojom_bindings_generator.gypi
copy to mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi
index c6b10afaed818ad8f1eca474e7dd7dc442534fee..8afc7672efa980a241748ed181a3a3a741b26cce 100644
--- a/mojo/public/tools/bindings/mojom_bindings_generator.gypi
+++ b/mojo/public/tools/bindings/mojom_bindings_generator_explicit.gypi
@@ -3,13 +3,17 @@
 # found in the LICENSE file.
 
 {
-  'rules': [
+  'variables': {
+    '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) <@(mojom_files))',
+    ],
+  },
+  'actions': [
     {
-      'rule_name': '<(_target_name)_mojom_bindings_generator',
-      'extension': 'mojom',
+      'action_name': '<(_target_name)_mojom_bindings_generator',
       'variables': {
-        'mojom_base_output_dir':
-             '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
         'mojom_bindings_generator':
             '<(DEPTH)/mojo/public/tools/bindings/mojom_bindings_generator.py',
         'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
@@ -75,39 +79,36 @@
         '<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/parse/translate.py',
       ],
       'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom.h',
-        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom.js',
-        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)_mojom.py',
-        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom-internal.h',
+        '<@(mojom_generated_outputs)',
       ],
       'action': [
         'python', '<@(mojom_bindings_generator)',
-        './<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom',
+        '<@(mojom_files)',
         '--use_chromium_bundled_pylibs',
         '-d', '<(DEPTH)',
         '<@(mojom_import_args)',
         '-o', '<(SHARED_INTERMEDIATE_DIR)',
         '--java_output_directory=<(java_out_dir)',
       ],
-      'message': 'Generating Mojo bindings from <(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom',
-      'process_outputs_as_sources': 1,
+      'message': 'Generating Mojo bindings from <@(mojom_files)',
     }
   ],
-  'include_dirs': [
-    '<(DEPTH)',
-    '<(SHARED_INTERMEDIATE_DIR)',
-  ],
-  'direct_dependent_settings': {
+  # TODO can we nessle direct_dependent_settings inside of direct_dependent_settings?

[jamesr, 2014/10/28 00:54:21]

you mean nestle? or nest? 'nessle' isn't a word afaik

can you please attach a name or a bug number to this TODO?

[Nick Bray (chromium), 2014/10/28 20:57:24]

Done.

+  'all_dependent_settings': {

[jamesr, 2014/10/28 00:54:21]

yuck, we don't want *everything* downstream to have these things on the include
path

[Nick Bray (chromium), 2014/10/28 20:57:24]

OK, spent the time to figure out if direct_dependent_settings can be set inside
direct_dependent_settings.  It can.  Uhg/w00t.

     'include_dirs': [
       '<(DEPTH)',
       '<(SHARED_INTERMEDIATE_DIR)',
     ],
+  },
+  'direct_dependent_settings': {
     'variables': {
       'generated_src_dirs': [
         '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
       ],
     },
+    'sources': [
+      '<@(mojom_generated_outputs)',
+    ],
   },
   'hard_dependency': 1,
 }