commit aaae43cd242a56124431d82e4ecae41b870e6653
author Jeff Gaston <jeffrygaston@google.com> Tue Apr 11 16:36:46 2017 -0700
committer Jeff Gaston <jeffrygaston@google.com> Fri Jul 14 13:04:05 2017 -0700
tree cf6296b1a456b4d772444ab23fb6b45fe5d56c52
parent b253e8e854212527b1547e9f1020110ab5f99c20

Update to latest jacoco usage

Bug: 36792868
Test: EMMA_INSTRUMENT_STATIC=true m -j

Change-Id: I419b543283b52be9a72f5c6b10e4cbea68782174

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index f839d3d..5b2ac90 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -668,7 +668,7 @@
 
 FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin
 FINDBUGS := $(FINDBUGS_DIR)/findbugs
-EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX)
+JACOCO_CLI_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jacoco-cli$(COMMON_JAVA_PACKAGE_SUFFIX)
 
 # Tool to merge AndroidManifest.xmls
 ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge