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

Unified Diff: build/java.gypi

Issue 22831044: Adds ability to exclude java libraries (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 | third_party/cacheinvalidation/cacheinvalidation.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 95858ee298ed1741475dbb9d53d6f83a90ab9d7e..2e03bab7cceb7647af86c8d4285885c01dbc57a0 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -78,6 +78,7 @@
'variables': {
'variables': {
'proguard_preprocess%': 0,
+ 'emma_never_instrument%': 0,
},
'conditions': [
['proguard_preprocess == 1', {
@@ -85,16 +86,15 @@
}, {
'javac_jar_path': '<(jar_path)'
}],
+ ['chromium_code != 0 and emma_coverage != 0 and emma_never_instrument == 0', {
+ 'emma_instrument': 1,
+ }, {
+ 'emma_instrument': 0,
+ }],
],
},
+ 'emma_instrument': '<(emma_instrument)',
'javac_jar_path': '<(javac_jar_path)',
- 'conditions': [
- ['chromium_code != 0 and emma_coverage != 0', {
- 'emma_instrument': 1,
- }, {
- 'emma_instrument': 0,
- }],
- ],
},
# This all_dependent_settings is used for java targets only. This will add the
# jar path to the classpath of dependent java targets.
« no previous file with comments | « no previous file | third_party/cacheinvalidation/cacheinvalidation.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698