openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Use space-separated coverage paths." 

am: f7a596a161

Change-Id: I8dce3520428550e9c1591b6d4fbd7733429c5a78
This commit is contained in:
Ryan Campbell 2017-10-23 23:44:44 +00:00 committed by android-build-merger
parent a89179ad7c f7a596a161
commit 84a873dd50
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/binary.mk
View File

@ -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_export_c_include_deps := $(LOCAL_EXPORT_C_INCLUDE_DEPS)
my_arflags := my_arflags :=
ifneq (,$(strip $(foreach dir,$(subst $(comma),$(space),$(COVERAGE_PATHS)),$(filter $(dir)%,$(LOCAL_PATH))))) ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
ifeq (,$(strip $(foreach dir,$(subst $(comma),$(space),$(COVERAGE_EXCLUDE_PATHS)),$(filter $(dir)%,$(LOCAL_PATH))))) ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
my_native_coverage := true my_native_coverage := true
else else
my_native_coverage := false my_native_coverage := false

4
core/soong_config.mk
View File

@ -85,8 +85,8 @@ $(call add_json_bool, ClangTidy, $(filter 1 true,$(WITH_
$(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS)) $(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS))
$(call add_json_bool, NativeCoverage, $(filter true,$(NATIVE_COVERAGE))) $(call add_json_bool, NativeCoverage, $(filter true,$(NATIVE_COVERAGE)))
$(call add_json_csv, CoveragePaths, $(COVERAGE_PATHS)) $(call add_json_list, CoveragePaths, $(COVERAGE_PATHS))
$(call add_json_csv, CoverageExcludePaths, $(COVERAGE_EXCLUDE_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, ArtUseReadBarrier, $(call invert_bool,$(filter false,$(PRODUCT_ART_USE_READ_BARRIER))))
$(call add_json_bool, Binder32bit, $(BINDER32BIT)) $(call add_json_bool, Binder32bit, $(BINDER32BIT))