diff options
| author | Oliver Nguyen <olivernguyen@google.com> | 2020-07-06 21:07:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-06 21:07:54 +0000 |
| commit | e02730e29a21165b51e4303a595b120ccd7c4db2 (patch) | |
| tree | 0c082f342a1e152957f937d5a56216416e4db578 | |
| parent | e6c24147f0f9acd080e54b07154a38f07ebb7dff (diff) | |
| parent | b6ff8225b152bca74b31cf388c7b6142f9f79bf0 (diff) | |
| download | build-e02730e29a21165b51e4303a595b120ccd7c4db2.tar.gz | |
Merge changes from topic "gcov-clang-migration" into rvc-dev
* changes:
Rename Native_coverage to GcovCoverage in Soong
Introduce product variables to select Java code coverage paths in Make.
Rename native code coverage paths product variables in Make.
| -rw-r--r-- | core/binary.mk | 8 | ||||
| -rw-r--r-- | core/line_coverage.mk | 5 | ||||
| -rw-r--r-- | core/soong_config.mk | 14 |
3 files changed, 18 insertions, 9 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..c89642e630 100644 --- a/core/line_coverage.mk +++ b/core/line_coverage.mk @@ -8,8 +8,7 @@ # packs them into another zip file called `line_coverage_profiles.zip`. # # 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=true NATIVE_COVERAGE_PATHS=* make haiku-line-coverage # ----------------------------------------------------------------- # TODO(b/148306195): Due this issue some fuzz targets cannot be built with @@ -68,7 +67,7 @@ critical_components_shared_inputs := $(foreach lib,$(critical_components_shared) fuzz_target_inputs := $(foreach fuzz,$(fuzz_targets), \ $(call intermediates-dir-for,EXECUTABLES,$(fuzz))/$(fuzz)) -# When line coverage is enabled (NATIVE_LINE_COVERAGE is set), make creates +# When coverage is enabled (NATIVE_COVERAGE is set), make creates # a "coverage" directory and stores all profile (*.gcno) files in inside. # We need everything that is stored inside this directory. $(line_coverage_profiles): $(fuzz_target_inputs) diff --git a/core/soong_config.mk b/core/soong_config.mk index 3f4ba24bc3..51b7e384a4 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -110,11 +110,17 @@ $(call add_json_bool, DisableScudo, $(filter true,$(PRODUCT $(call add_json_bool, ClangTidy, $(filter 1 true,$(WITH_TIDY))) $(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_list, JavaCoveragePaths, $(JAVA_COVERAGE_PATHS)) +$(call add_json_list, JavaCoverageExcludePaths, $(JAVA_COVERAGE_EXCLUDE_PATHS)) + +$(call add_json_bool, GcovCoverage, $(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))) |