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

Commit a435aa51 authored Oct 20, 2017 by Ryan Campbell

Use space-separated coverage paths.

Specify paths to instrument with coverage using space separated lists
instead of comma separated. This makes it easier to specify the lists in
a typical format in the device mk.

Test: add COVERAGE_PATHS to device-sailfish.mk, make -j60
Bug: 67998360
Change-Id: I26c67127d72bd7a153eb4a2c23eae4881a813d54

parent 8bef6515

core/binary.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,8 +62,8 @@ my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
		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)))))
		ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
		ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
		my_native_coverage := true
		else
		my_native_coverage := false

core/soong_config.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,8 +85,8 @@ $(call add_json_bool, ClangTidy, $(filter 1 true,$(WITH_
		$(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS))

		$(call add_json_bool, NativeCoverage, $(filter true,$(NATIVE_COVERAGE)))
		$(call add_json_csv, CoveragePaths, $(COVERAGE_PATHS))
		$(call add_json_csv, CoverageExcludePaths, $(COVERAGE_EXCLUDE_PATHS))
		$(call add_json_list, CoveragePaths, $(COVERAGE_PATHS))
		$(call add_json_list, CoverageExcludePaths, $(COVERAGE_EXCLUDE_PATHS))

		$(call add_json_bool, ArtUseReadBarrier, $(call invert_bool,$(filter false,$(PRODUCT_ART_USE_READ_BARRIER))))
		$(call add_json_bool, Binder32bit, $(BINDER32BIT))