commit cb49804e06adab2882bbcd15230b188f4977eb5a
author Sebastien Hertz <shertz@google.com> Mon Apr 11 14:31:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 11 14:31:35 2016 +0000
tree a6bc32b5eed754dcb8855870fd8690c0a4776539
parent 06dbe198b9f50d71bf24b52819110594007b14ae
parent 74ec3f49d199f538deca795f22e454638b4d7915

Merge "Update code coverage filtering"

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 9adb09c..8de365c 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -109,6 +109,8 @@
 # full or incremental
 LOCAL_JACK_ENABLED:=full
 LOCAL_JACK_FLAGS:=
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER:=
+LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:=
 LOCAL_CERTIFICATE:=
 LOCAL_SDK_VERSION:=
 LOCAL_SDK_RES_VERSION:=

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 7781799..a070d20 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -638,9 +638,11 @@
 
 ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
 $(built_dex_intermediate): PRIVATE_JACK_COVERAGE_OPTIONS := \
-    -D jack.coverage="true" \
+    -D jack.coverage=true \
     -D jack.coverage.metadata.file=$(intermediates.COMMON)/coverage.em \
-    -D jack.coverage.jacoco.package=$(JACOCO_PACKAGE_NAME)
+    -D jack.coverage.jacoco.package=$(JACOCO_PACKAGE_NAME) \
+    $(addprefix -D jack.coverage.jacoco.include=,$(LOCAL_JACK_COVERAGE_INCLUDE_FILTER)) \
+    $(addprefix -D jack.coverage.jacoco.exclude=,$(LOCAL_JACK_COVERAGE_EXCLUDE_FILTER))
 else
 $(built_dex_intermediate): PRIVATE_JACK_COVERAGE_OPTIONS :=
 endif