Fix stale mojom-generated Java problems with gyp builds

third_party/mojo/mojom_bindings_generator.gypi

Index: third_party/mojo/mojom_bindings_generator.gypi
diff --git a/third_party/mojo/mojom_bindings_generator.gypi b/third_party/mojo/mojom_bindings_generator.gypi
index e58aab34401e2c543761f89f17d26e914c132e6f..139d92433a441d2400e9d6ee6b97345ab95f593c 100644
--- a/third_party/mojo/mojom_bindings_generator.gypi
+++ b/third_party/mojo/mojom_bindings_generator.gypi
@@ -6,6 +6,24 @@
   'includes': [
     'mojom_bindings_generator_variables.gypi',
   ],
+  'actions': [
+    {
+      'variables': {
+        'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
+        'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_name).stamp',
+      },
+      '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': [ '<@(_sources)' ],
+      'outputs': [ '<(stamp_filename)' ],
+    }
+  ],
   'rules': [
     {
       'rule_name': '<(_target_name)_mojom_bindings_generator',
@@ -18,9 +36,11 @@
          '-I<(DEPTH)',
          '-I<(DEPTH)/third_party/mojo/src'
         ],
+        'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_name).stamp',
       },
       'inputs': [
         '<@(mojom_bindings_generator_sources)',
+        '<(stamp_filename)',
       ],
       'outputs': [
         '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom.cc',
@@ -60,6 +80,10 @@
         '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
       ],
     },
+    'additional_input_paths': [

[cjhopman, 2015/02/26 02:38:38]

this needs to go in the variables block with generated_src_dirs

+      '<@(mojom_bindings_generator_sources)',
+      '<@(_sources)',
+    ],
   },
   'hard_dependency': 1,
 }