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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/java_apk.gypi

Issue 22929039: Fixes dexing of emma_device.jar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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 | « no previous file | 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 164848109dc040c8647783c3f25bdb56226d670f..d8a6cacf3e8e75fcd841a00990b0d3db3f5c47e5 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -564,9 +564,11 @@
'proguard_enabled_input_path': '<(obfuscated_jar_path)',
}],
['emma_instrument != 0', {
- 'dex_input_paths': [ '<(emma_device_jar)' ],
'dex_no_locals': 1,
}],
+ ['emma_instrument != 0 and is_test_apk == 0', {
+ 'dex_input_paths': [ '<(emma_device_jar)' ],
+ }],
],
'input_paths': [ '<(instr_stamp)' ],
'dex_input_paths': [ '>@(library_dexed_jars_paths)' ],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698