Consider empty LOCAL_JACK_COVERAGE_INCLUDE_FILTER to match everything

Test: m EMMA_INSTRUMENT=true
Bug: 68056327

Change-Id: I4af136490e572ba603d2a77f70e49d1feec1eb00
This commit is contained in:
Jeff Gaston 2017-10-20 18:47:25 -07:00
parent 0832a9976c
commit e84fdb7b2d
1 changed files with 2 additions and 7 deletions

View File

@ -49,11 +49,6 @@ ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
else else
my_exclude_args := my_exclude_args :=
endif 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 my_files := $(intermediates.COMMON)/jacoco
@ -132,8 +127,8 @@ $(LOCAL_FULL_CLASSES_JACOCO_JAR): $(my_instrumented_timestamp_path) $(LOCAL_FULL
# dependency. # dependency.
$(LOCAL_FULL_CLASSES_JACOCO_JAR): $(my_classes_to_report_on_path) $(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) 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) LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_FULL_CLASSES_JACOCO_JAR)