From b6ff8225b152bca74b31cf388c7b6142f9f79bf0 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 16 Jun 2020 17:49:08 -0700
Subject: [PATCH] Rename Native_coverage to GcovCoverage in Soong

Pass the NATIVE_COVERAGE Make variable to Soong as the more accurate
GcovCoverage.  Also remove NATIVE_LINE_COVERAGE, it doesn't do anything
different from NATIVE_COVERAGE, and NATIVE_COVERAGE is always set when
NATIVE_LINE_COVERAGE is set.

Bug: 159059537
Test: m checkbuild
Merged-In: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
Change-Id: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
---
 core/line_coverage.mk | 5 ++---
 core/soong_config.mk  | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

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`.