tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Rename native code coverage paths product variables in Make." am: d160a49df3 am: b502030f63 am: 85781a7619

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: I088be59080a857bfe5de6dc933e109743346b8cb
This commit is contained in:
Roland Levillain 2020-06-15 10:51:22 +00:00 committed by Automerger Merge Worker
commit 923eed8a30
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/binary.mk
View file

@ -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

2
core/line_coverage.mk
View file

@ -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

8
core/soong_config.mk
View file

@ -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)))