diff options
| author | Roland Levillain <rpl@google.com> | 2020-06-09 12:39:36 +0100 |
|---|---|---|
| committer | Oliver Nguyen <olivernguyen@google.com> | 2020-06-29 17:54:08 -0700 |
| commit | bdb1b4c79afea29d8708afeb09771eaaa6753350 (patch) | |
| tree | 4b0e81a203a0a7b232b176a9f1efc1d05f90e0ce | |
| parent | 30d5c93f4738d86a21393bb2195fab146e1d074a (diff) | |
| download | build-bdb1b4c79afea29d8708afeb09771eaaa6753350.tar.gz | |
Rename native code coverage paths product variables in Make.
Rename `CoveragePath` and `CoverageExcludePaths` as
`NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.).
Also, populate `NativeCoveragePath` and `NativeCoverageExcludePaths`
from environment variables `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).
Test: m nothing
Bug: 158212027
Merged-In: I409dbb04b09744a7bd95a4b69361e858b9f89e23
Change-Id: I409dbb04b09744a7bd95a4b69361e858b9f89e23
(cherry picked from commit bad8b386e6dcf0302e1ebe855017390038bee11d)
| -rw-r--r-- | core/binary.mk | 8 | ||||
| -rw-r--r-- | core/line_coverage.mk | 2 | ||||
| -rw-r--r-- | core/soong_config.mk | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/core/binary.mk b/core/binary.mk index 7ee8c5c7e0..23a201c4ef 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -71,8 +71,12 @@ ifeq (,$(strip $(my_cc))$(strip $(my_cxx))) my_pool := $(GOMA_OR_RBE_POOL) endif -ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH))))) -ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH))))) +# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this condition when all users have been moved +# to `NATIVE_COVERAGE_PATHS`. +ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH))))) +# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this condition when all users have been +# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`. +ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH))))) my_native_coverage := true else my_native_coverage := false diff --git a/core/line_coverage.mk b/core/line_coverage.mk index 9b0b528600..b920e285d4 100644 --- a/core/line_coverage.mk +++ b/core/line_coverage.mk @@ -9,7 +9,7 @@ # # To run the make target set the coverage related envvars first: # NATIVE_LINE_COVERAGE=true NATIVE_COVERAGE=true \ -# COVERAGE_PATHS=* make haiku-line-coverage +# NATIVE_COVERAGE_PATHS=* make haiku-line-coverage # ----------------------------------------------------------------- # TODO(b/148306195): Due this issue some fuzz targets cannot be built with diff --git a/core/soong_config.mk b/core/soong_config.mk index 3f4ba24bc3..b69052adb5 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -113,8 +113,12 @@ $(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS)) $(call add_json_bool, NativeLineCoverage, $(filter true,$(NATIVE_LINE_COVERAGE))) $(call add_json_bool, Native_coverage, $(filter true,$(NATIVE_COVERAGE))) $(call add_json_bool, ClangCoverage, $(filter true,$(CLANG_COVERAGE))) -$(call add_json_list, CoveragePaths, $(COVERAGE_PATHS)) -$(call add_json_list, CoverageExcludePaths, $(COVERAGE_EXCLUDE_PATHS)) +# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this list when all users have been moved to +# `NATIVE_COVERAGE_PATHS`. +$(call add_json_list, NativeCoveragePaths, $(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS)) +# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this list when all users have been +# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`. +$(call add_json_list, NativeCoverageExcludePaths, $(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS)) $(call add_json_bool, SamplingPGO, $(filter true,$(SAMPLING_PGO))) |