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

Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2

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

Change-Id: Ia009dc13662e87b7f8494849f7d9f35442c9af9d
This commit is contained in:
Colin Cross 2020-06-23 03:19:51 +00:00 committed by Automerger Merge Worker
commit c018eacb4e
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/line_coverage.mk
View file

@ -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 \
# NATIVE_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
@ -67,7 +66,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)

3
core/soong_config.mk
View file

@ -114,8 +114,7 @@ $(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS))
$(call add_json_list, JavaCoveragePaths, $(JAVA_COVERAGE_PATHS))
$(call add_json_list, JavaCoverageExcludePaths, $(JAVA_COVERAGE_EXCLUDE_PATHS))
$(call add_json_bool, NativeLineCoverage, $(filter true,$(NATIVE_LINE_COVERAGE)))
$(call add_json_bool, Native_coverage, $(filter true,$(NATIVE_COVERAGE)))
$(call add_json_bool, GcovCoverage, $(filter true,$(NATIVE_COVERAGE)))
$(call add_json_bool, ClangCoverage, $(filter true,$(CLANG_COVERAGE)))
# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this list when all users have been moved to
# `NATIVE_COVERAGE_PATHS`.