commit 74ec3f49d199f538deca795f22e454638b4d7915
author Sebastien Hertz <shertz@google.com> Wed Apr 06 18:18:47 2016 +0200
committer Sebastien Hertz <shertz@google.com> Fri Apr 08 10:26:49 2016 +0200
tree 24f62a553109d82ec1f2bb48a1df8d35534e5a4a
parent 2e8a1fc96695478be7e0d9efc3f99a305b10930b

Update code coverage filtering

Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).

When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.

Bug: 28014424
Change-Id: Ic29c99b6feb7ea2251c29d659e7ea1f1c46d1ed1

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 189d13f..1105782 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -630,9 +630,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