From e84fdb7b2d30efedeb8e005818aec699f613c3a9 Mon Sep 17 00:00:00 2001 From: Jeff Gaston Date: Fri, 20 Oct 2017 18:47:25 -0700 Subject: [PATCH] Consider empty LOCAL_JACK_COVERAGE_INCLUDE_FILTER to match everything Test: m EMMA_INSTRUMENT=true Bug: 68056327 Change-Id: I4af136490e572ba603d2a77f70e49d1feec1eb00 --- core/jacoco.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/jacoco.mk b/core/jacoco.mk index 225c2a193..fa31fefe4 100644 --- a/core/jacoco.mk +++ b/core/jacoco.mk @@ -49,11 +49,6 @@ ifeq ($(LOCAL_EMMA_INSTRUMENT),true) else my_exclude_args := endif -endif # LOCAL_EMMA_INSTRUMENT == true - -# determine whether to run the instrumenter based on whether there is any work -# for it to do -ifneq ($(my_include_filter),) my_files := $(intermediates.COMMON)/jacoco @@ -132,8 +127,8 @@ $(LOCAL_FULL_CLASSES_JACOCO_JAR): $(my_instrumented_timestamp_path) $(LOCAL_FULL # dependency. $(LOCAL_FULL_CLASSES_JACOCO_JAR): $(my_classes_to_report_on_path) -else # my_include_filter == '' +else # LOCAL_EMMA_INSTRUMENT != true LOCAL_FULL_CLASSES_JACOCO_JAR := $(LOCAL_FULL_CLASSES_PRE_JACOCO_JAR) -endif # my_include_filter != '' +endif # LOCAL_EMMA_INSTRUMENT == true LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_FULL_CLASSES_JACOCO_JAR)