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

Unified Diff: build/java_apk.gypi

Issue 183883024: android: Make dex_action.gypi not call md5sum. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clobber Created 6 years, 9 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/gyp/dex.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index bf841fe90616551277e0103aeed0581f3a472e69..b4dbb72d1b7af3d4220c080d7910a8eb68f9560f 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -623,6 +623,8 @@
'>@(proguard_flags_paths)',
],
'outputs': [
+ # This lists obfuscate_stamp instead of obfuscated_jar_path because
+ # ant only writes the latter if the md5 of the inputs changes.
'<(obfuscate_stamp)',
],
'action': [
@@ -661,10 +663,6 @@
'action_name': 'dex_<(_target_name)',
'variables': {
'conditions': [
- ['proguard_enabled == "true"', {
- 'input_paths': [ '<(obfuscate_stamp)' ],
- 'proguard_enabled_input_path': '<(obfuscated_jar_path)',
- }],
['emma_instrument != 0', {
'dex_no_locals': 1,
}],
@@ -672,11 +670,15 @@
'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)',
+ 'proguard_enabled_input_path': '<(obfuscated_jar_path)',
},
+ 'conditions': [
+ ['proguard_enabled == "true"', { 'inputs': [ '<(obfuscate_stamp)' ] },
+ { 'inputs': [ '<(instr_stamp)' ] }],
+ ],
'includes': [ 'android/dex_action.gypi' ],
},
{
« no previous file with comments | « build/android/gyp/dex.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698