diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 9adb09caa..8de365cd7 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -109,6 +109,8 @@ LOCAL_ALLOW_UNDEFINED_SYMBOLS:= # 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:= diff --git a/core/java.mk b/core/java.mk index 778179989..a070d200f 100644 --- a/core/java.mk +++ b/core/java.mk @@ -638,9 +638,11 @@ $(built_dex_intermediate): PRIVATE_CLASSES_JACK := $(full_classes_jack) 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