android: Make dex_action.gypi not call md5sum.

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, 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.)

java_apk.gypi used to set input_paths to two files in proguard-enabled
files – change it to depend only on obfuscate_stamp in proguard builds,
as the step that writes that already depends on instr_stamp. (This isn't
necessary as the proguard state is part of the dex.py commandline, so
toggling between proguard and no proguard would rebuild correctly
anyways, but it's conceptually a bit nicer.)

Also set proguard_enabled_input_path unconditionally. Again, no behavior
change, but keeps the gyp a bit shorter.

BUG=177552
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=255325

R=cjhopman@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=255403

[cjhopman, 2014-03-06 02:16:32]

lgtm

https://codereview.chromium.org/183883024/diff/1/build/java_apk.gypi
File build/java_apk.gypi (right):

https://codereview.chromium.org/183883024/diff/1/build/java_apk.gypi#newcode679
build/java_apk.gypi:679: 'inputs': [ '<(instr_stamp)', ],
I think I like this much better (sticking inputs directly into 'inputs' rather
than having the indirection through a variable).

[Nico, 2014-03-06 03:52:52]

The CQ bit was checked by thakis@chromium.org

[commit-bot: I haz the power, 2014-03-06 03:54:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/183883024/1

[commit-bot: I haz the power, 2014-03-06 13:11:14]

Change committed as 255325

[pkotwicz, 2014-03-06 15:52:39]

A revert of this CL has been created in
https://codereview.chromium.org/185563012/ by pkotwicz@chromium.org.

The reason for reverting is: Experimentally reverting because it is possible
that this CL broke the android build
http://build.chromium.org/p/chromium/builders/Android/builds/21418/steps/comp...

Will undo the revert if this CL is innocent.

[Nico, 2014-03-06 16:51:38]

https://codereview.chromium.org/183883024/diff/1/build/java_apk.gypi
File build/java_apk.gypi (right):

https://codereview.chromium.org/183883024/diff/1/build/java_apk.gypi#newcode665
build/java_apk.gypi:665: 'input_paths': [ '<(obfuscate_stamp)' ],
Aha, I missed this reference to input_paths.

[Nico, 2014-03-06 17:10:18]

Ok, patch set 2 should fix clobber builds, with minor tweaks. I sent a clobber
tryjob.

[Nico, 2014-03-06 17:15:42]

I guess I'd need a proguard tryjob though. I'll try doing one at my desktop once
I'm there before landing again.

[Nico, 2014-03-06 18:35:32]

I checked that gypping with GYP_DEFINES='OS=android proguard_enabled=1' and
building multiple_proguards_test_apk reproduces the builder error with patch set
1, and that the same works fine with patch set 2 (with a fresh build dir each
time).

[Nico, 2014-03-06 18:47:31]

Committed patchset #2 manually as r255403 (tree was closed).