diff --git a/core/line_coverage.mk b/core/line_coverage.mk index b920e285d4..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 \ -# 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) diff --git a/core/soong_config.mk b/core/soong_config.mk index e6d5f54410..51b7e384a4 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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`.