diff options
| author | gkanwar@chromium.org <gkanwar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-24 03:25:14 +0000 |
|---|---|---|
| committer | gkanwar@chromium.org <gkanwar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-24 03:25:14 +0000 |
| commit | f690693fb5234ff40065e097060fe81d4f9de398 (patch) | |
| tree | bf2829e085c09c4aa492687cbf2aadc5007a8193 | |
| parent | 002468af484951e54ed7b91b5293da1c2367746e (diff) | |
| download | chromium_src-f690693fb5234ff40065e097060fe81d4f9de398.zip chromium_src-f690693fb5234ff40065e097060fe81d4f9de398.tar.gz chromium_src-f690693fb5234ff40065e097060fe81d4f9de398.tar.bz2 | |
Adds ability to exclude java libraries
NOTRY=True
BUG=278365
Review URL: https://chromiumcodereview.appspot.com/22831044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219409 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/java.gypi | 14 | ||||
| -rw-r--r-- | third_party/cacheinvalidation/cacheinvalidation.gyp | 1 |
2 files changed, 8 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. diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index bd8586f..166dbef 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -7,6 +7,7 @@ # This library should build cleanly with the extra warnings turned on # for Chromium. 'chromium_code': 1, + 'emma_never_instrument': 1, }, 'targets': [ # The C++ files generated from the cache invalidation protocol buffers. |