Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c9f3b9f authored by Oliver Nguyen's avatar Oliver Nguyen Committed by Automerger Merge Worker
Browse files

Merge changes from topic "gcov-clang-migration" into rvc-dev am: e02730e2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040351

Change-Id: I6f66da1d33ca53c7d4ad8cb1023986643a6707b7
parents c85e9b52 e02730e2

core/line_coverage.mk

+2 −3
Original line number Diff line number Diff line
@@ -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
@@ -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)

core/soong_config.mk

+1 −2
Original line number Diff line number Diff line
@@ -113,8 +113,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`.