Merge "Consider empty LOCAL_JACK_COVERAGE_INCLUDE_FILTER to match everything"
diff --git a/core/jacoco.mk b/core/jacoco.mk
index 225c2a1..fa31fef 100644
--- a/core/jacoco.mk
+++ b/core/jacoco.mk
@@ -49,11 +49,6 @@
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 @@
# 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)