From a435aa5171f3b2f83f737a17c099587f51d9dabf Mon Sep 17 00:00:00 2001 From: Ryan Campbell Date: Fri, 20 Oct 2017 16:19:42 -0700 Subject: [PATCH] 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 --- core/binary.mk | 4 ++-- core/soong_config.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index 3e31d9a80..bd1e60132 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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 diff --git a/core/soong_config.mk b/core/soong_config.mk index 629edfc89..e774fc810 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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))