diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 15:53:56 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 15:53:56 +0000 |
| commit | bf0c0d522f7b39e4fce43077e4c39cdbc1432492 (patch) | |
| tree | ed283149405a7faf8d1084c66e12e5bc02710517 /build/java_apk.gypi | |
| parent | b5034ea87707d2199f69c31ea424bd456072ecae (diff) | |
| download | chromium_src-bf0c0d522f7b39e4fce43077e4c39cdbc1432492.zip chromium_src-bf0c0d522f7b39e4fce43077e4c39cdbc1432492.tar.gz chromium_src-bf0c0d522f7b39e4fce43077e4c39cdbc1432492.tar.bz2 | |
Revert of android: Make dex_action.gypi not call md5sum. (https://codereview.chromium.org/183883024/)
Reason for revert:
Experimentally reverting because it is possible that this CL broke the android build http://build.chromium.org/p/chromium/builders/Android/builds/21418/steps/compile/logs/stdio
Will undo the revert if this CL is innocent
Original issue's description:
> android: Make dex_action.gypi not call md5sum.
>
> No intended behavior change.
>
> dex_action.gypi didn't pass its input_paths variable to dex.py,
> but that was only set in a single place, and only to a single file there.
> It was only used in java_apk.gypi which does manual threading of
> stamp files to order actions (since it's a gypi, it can't easily use type
> none targets with dependencies). Since dex.py doesn't look at this
> stamp file at all, the it doesn't need to rerun when the stamp file disappears.
>
> To make this a bit more obvious, remove dex_action.gypi's input_paths
> variable and set 'inputs' directly in the one place with the stamp file.
> (dex.py will still rerun if the name of the stamp file changes, due to
> regular timestamp handling.)
>
> BUG=177552
> NOTRY=true
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=255325
TBR=cjhopman@chromium.org,thakis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=177552
Review URL: https://codereview.chromium.org/185563012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 49e6ebe..bf841fe 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -672,11 +672,11 @@ 'dex_input_paths': [ '<(emma_device_jar)' ], }], ], + 'input_paths': [ '<(instr_stamp)' ], 'dex_input_paths': [ '>@(library_dexed_jars_paths)' ], 'dex_generated_input_dirs': [ '<(classes_final_dir)' ], 'output_path': '<(dex_path)', }, - 'inputs': [ '<(instr_stamp)', ], 'includes': [ 'android/dex_action.gypi' ], }, { |