summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2015-02-27 16:05:56 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-28 00:06:44 +0000
commit7a8e7054cd6d3a8ce9a5891f021629de94d8ae86 (patch)
tree264a127be5ba7c4d689df8bcd31f5bdff204efd7 /third_party
parent04824a974ff0bc9669a5746abefe1caa26ce6be1 (diff)
downloadchromium_src-7a8e7054cd6d3a8ce9a5891f021629de94d8ae86.zip
chromium_src-7a8e7054cd6d3a8ce9a5891f021629de94d8ae86.tar.gz
chromium_src-7a8e7054cd6d3a8ce9a5891f021629de94d8ae86.tar.bz2
Clean up stale java in explicit bindings generator gypi
This applies the same approach as r318190 to clean up stale generated java when any mojom dependencies have changed in gyp targets using mojom_bindings_generator_explicit.gypi. BUG=461622 R=jamesr@chromium.org Review URL: https://codereview.chromium.org/963773002 Cr-Commit-Position: refs/heads/master@{#318554}
Diffstat (limited to 'third_party')
-rw-r--r--third_party/mojo/mojom_bindings_generator_explicit.gypi22
1 files changed, 22 insertions, 0 deletions
diff --git a/third_party/mojo/mojom_bindings_generator_explicit.gypi b/third_party/mojo/mojom_bindings_generator_explicit.gypi
index d03eb85..f65ec3e 100644
--- a/third_party/mojo/mojom_bindings_generator_explicit.gypi
+++ b/third_party/mojo/mojom_bindings_generator_explicit.gypi
@@ -19,9 +19,26 @@
# to be compiled with multiple toolchains - target, NaCl, etc.
'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': [ '<@(mojom_files)' ],
+ 'outputs': [ '<(stamp_filename)' ],
+ },
+ {
'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)/third_party/mojo/src'
@@ -30,6 +47,7 @@
'inputs': [
'<@(mojom_bindings_generator_sources)',
'<@(mojom_files)',
+ '<(stamp_filename)',
],
'outputs': [
'<@(mojom_generated_outputs)',
@@ -79,6 +97,10 @@
'generated_src_dirs': [
'<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
],
+ 'additional_input_paths': [
+ '<@(mojom_bindings_generator_sources)',
+ '<@(mojom_files)',
+ ],
},
}
},