diff options
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/java.gypi b/build/java.gypi index 95858ee..2e03bab 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. |