Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb49804e authored by Sebastien Hertz's avatar Sebastien Hertz Committed by Gerrit Code Review
Browse files

Merge "Update code coverage filtering"

parents 06dbe198 74ec3f49

core/clear_vars.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -109,6 +109,8 @@ LOCAL_ALLOW_UNDEFINED_SYMBOLS:= 
# full or incremental

# full or incremental

LOCAL_JACK_ENABLED:=full

LOCAL_JACK_ENABLED:=full

LOCAL_JACK_FLAGS:=

LOCAL_JACK_FLAGS:=

LOCAL_JACK_COVERAGE_INCLUDE_FILTER:=

LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:=

LOCAL_CERTIFICATE:=

LOCAL_CERTIFICATE:=

LOCAL_SDK_VERSION:=

LOCAL_SDK_VERSION:=

LOCAL_SDK_RES_VERSION:=

LOCAL_SDK_RES_VERSION:=

core/java.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -638,9 +638,11 @@ $(built_dex_intermediate): PRIVATE_CLASSES_JACK := $(full_classes_jack) 




ifeq ($(LOCAL_EMMA_INSTRUMENT),true)

ifeq ($(LOCAL_EMMA_INSTRUMENT),true)

$(built_dex_intermediate): PRIVATE_JACK_COVERAGE_OPTIONS := \

$(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.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

else

$(built_dex_intermediate): PRIVATE_JACK_COVERAGE_OPTIONS :=

$(built_dex_intermediate): PRIVATE_JACK_COVERAGE_OPTIONS :=

endif

endif