commit 758f8728365358e41380c64806fb9cb0f026b980
author Dan Willemsen <dwillemsen@google.com> Mon Apr 11 19:59:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 11 19:59:10 2016 +0000
tree 4b8c789b18b1584b1dab03e9c4e9ee55b7164770
parent 18da8dd97a39b562fbf021b8058c39904c74d418
parent 23f326a67d72f20e2ee912b7982d00c5acd43db6

Merge "Ensure prebuilt executables are executable" into nyc-dev

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 4610a7f..9c2fa1d 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -111,6 +111,8 @@
 LOCAL_DX_FLAGS:=
 LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental
 LOCAL_JACK_FLAGS:=
+LOCAL_JACK_COVERAGE_INCLUDE_FILTER:=
+LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:=
 LOCAL_JILL_FLAGS:=
 LOCAL_CERTIFICATE:=
 LOCAL_SDK_VERSION:=

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 760d1e1..2caf511 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -714,9 +714,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