diff options
| author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 18:05:34 +0000 |
|---|---|---|
| committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 18:05:34 +0000 |
| commit | 326a5ae9f56cf121fb7f57028ae0f5f5116e0f27 (patch) | |
| tree | 69fde594549e472501fc6d832c8e27f6c6387d69 /build/protoc_java.gypi | |
| parent | 64d74caff8bc8e598e99c066da85360effab5662 (diff) | |
| download | chromium_src-326a5ae9f56cf121fb7f57028ae0f5f5116e0f27.zip chromium_src-326a5ae9f56cf121fb7f57028ae0f5f5116e0f27.tar.gz chromium_src-326a5ae9f56cf121fb7f57028ae0f5f5116e0f27.tar.bz2 | |
Fix protoc_java.gypi action dependency.
The genproto_java action was not necessarily run before the java.gypi
included action, so the build would fail.
This makes java.gypi depend on the genproto_java stamp file, so the
order will now be deterministic.
BUG=161587
Review URL: https://codereview.chromium.org/11413091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/protoc_java.gypi')
| -rw-r--r-- | build/protoc_java.gypi | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build/protoc_java.gypi b/build/protoc_java.gypi index 1d2d697..4465c10 100644 --- a/build/protoc_java.gypi +++ b/build/protoc_java.gypi @@ -42,11 +42,15 @@ 'java_out_dir': '<(PRODUCT_DIR)/java_proto/<(_target_name)/src', 'proto_in_dir%': '.', 'stamp_file': '<(java_out_dir).stamp', - # Variables needed by java.gypi below. + 'script': '<(DEPTH)/build/protoc_java.py', + + # The rest of the variables here are for the java.gypi include. 'package_name': '<(_target_name)', 'java_in_dir': '<(DEPTH)/build/android/empty', - 'script': '<(DEPTH)/build/protoc_java.py', 'generated_src_dirs': ['<(java_out_dir)'], + # Adding the |stamp_file| to |additional_input_paths| makes the actions in + # the include of java.gypi depend on the genproto_java action. + 'additional_input_paths': ['<(stamp_file)'], }, 'actions': [ { |