Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3163)

Unified Diff: build/protoc_java.gypi

Issue 11413091: Fix protoc_java.gypi action dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/protoc_java.gypi
diff --git a/build/protoc_java.gypi b/build/protoc_java.gypi
index 1d2d697e9dc8d3fad97df60bcde1a93c5c207087..4465c109b8496cbf28d3c12188a526b116f3ec53 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': [
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698