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

Commit 26a4ce0b authored by Ryan Campbell's avatar Ryan Campbell Committed by android-build-merger
Browse files

Merge "Support path exclusion for native coverage." 

am: e317a2d1

Change-Id: I1b0f1d4bc0664ba5bd0f24dee8e0778d18a82504
parents 22bcc5db e317a2d1

core/binary.mk

+4 −0
Original line number Diff line number Diff line
@@ -61,10 +61,14 @@ my_export_c_include_deps := $(LOCAL_EXPORT_C_INCLUDE_DEPS) 
my_arflags :=



ifneq (,$(strip $(foreach dir,$(subst $(comma),$(space),$(COVERAGE_PATHS)),$(filter $(dir)%,$(LOCAL_PATH)))))

ifeq (,$(strip $(foreach dir,$(subst $(comma),$(space),$(COVERAGE_EXCLUDE_PATHS)),$(filter $(dir)%,$(LOCAL_PATH)))))

  my_native_coverage := true

else

  my_native_coverage := false

endif

else

  my_native_coverage := false

endif



my_allow_undefined_symbols := $(strip $(LOCAL_ALLOW_UNDEFINED_SYMBOLS))

ifdef SANITIZE_HOST

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ $(SOONG_VARIABLES): FORCE 
	echo ''; \

	echo '    "NativeCoverage": $(if $(filter true,$(NATIVE_COVERAGE)),true,false),'; \

	echo '    "CoveragePaths": [$(if $(COVERAGE_PATHS),"$(subst $(space),"$(comma)",$(subst $(comma),$(space),$(COVERAGE_PATHS)))")],'; \

	echo '    "CoverageExcludePaths": [$(if $(COVERAGE_EXCLUDE_PATHS),"$(subst $(space),"$(comma)",$(subst $(comma),$(space),$(COVERAGE_EXCLUDE_PATHS)))")],'; \

	echo ''; \

	echo '    "DeviceName": "$(TARGET_DEVICE)",'; \

	echo '    "DeviceArch": "$(TARGET_ARCH)",'; \