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

Unified Diff: build/java.gypi

Issue 12379066: Temporary fix for build break when removing Java files or resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 months 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 | « build/android/process_resources.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 576fdc4475ede4ddccaffcdeca1aab2df00c239d..17320a4f802fe91078679800bbbe8a180947a818 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -138,6 +138,11 @@
'--R-dir', '<(R_dir)',
'--res-dir', '<(res_dir)',
'--out-res-dir', '<(out_res_dir)',
+
+ # Add list of inputs to the command line, so if inputs change
+ # (e.g. if a resource if removed), the command will be re-run.
+ # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
+ '--ignore', '>(_inputs)',
],
},
],
@@ -174,6 +179,11 @@
'-DOUT_DIR=<(ant_build_out)/<(_target_name)',
'-DJAVAC_INCLUDES=>(javac_includes)',
+ # Add list of inputs to the command line, so if inputs change
+ # (e.g. if a Java file is removed), the command will be re-run.
+ # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
+ '-DTHIS_IS_IGNORED=>(_inputs)',
+
'-Dbasedir=<(java_in_dir)',
'-buildfile',
'<(DEPTH)/build/android/ant/chromium-jars.xml'
« no previous file with comments | « build/android/process_resources.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698