diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 00:36:41 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 00:36:41 +0000 |
| commit | a63d0d570c7bceed23becb2bb92decc3b7de1213 (patch) | |
| tree | 8dffdfcc900f19e07e018c3e86b0164436123aba | |
| parent | b180a0bb443a7858c3debb6a485efa0518c50d8d (diff) | |
| download | chromium_src-a63d0d570c7bceed23becb2bb92decc3b7de1213.zip chromium_src-a63d0d570c7bceed23becb2bb92decc3b7de1213.tar.gz chromium_src-a63d0d570c7bceed23becb2bb92decc3b7de1213.tar.bz2 | |
Temporary fix for build break when removing Java files or resources.
This appends the list of inputs to the ant and process_resources.py
commands. Thus when the list of inputs changes, the command line
changes, and ninja will re-run the command.
This will be removed once ninja is updated to automatically rebuild
when the input list changes.
BUG=177449,177552
Review URL: https://chromiumcodereview.appspot.com/12379066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186299 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | build/android/process_resources.py | 3 | ||||
| -rw-r--r-- | build/java.gypi | 10 | ||||
| -rw-r--r-- | build/java_apk.gypi | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/build/android/process_resources.py b/build/android/process_resources.py index b34f576..a5e2878 100755 --- a/build/android/process_resources.py +++ b/build/android/process_resources.py @@ -29,6 +29,9 @@ def ParseArgs(): parser.add_option('--res-dir', help='directory containing resources') parser.add_option('--out-res-dir', help='directory to hold crunched resources') + # This is part of a temporary fix for crbug.com/177552. + # TODO(newt): remove this once crbug.com/177552 is fixed in ninja. + parser.add_option('--ignore', help='this argument is ignored') (options, args) = parser.parse_args() if args: diff --git a/build/java.gypi b/build/java.gypi index 576fdc4..17320a4 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' diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 76c833a..de47514 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -201,6 +201,11 @@ '-DPROGUARD_FLAGS=>(proguard_flags)', '-DPROGUARD_ENABLED=>(proguard_enabled)', + # 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-apk.xml', |