commit 0452678a40f262db641a26b8588fde86645b6796
author Oliver Nguyen <olivernguyen@google.com> Tue Apr 21 12:40:27 2020 -0700
committer Oliver Nguyen <olivernguyen@google.com> Wed Apr 22 13:30:07 2020 -0700
tree cbdf466ba602083b00271057982731ae23132a22
parent 383683559c4ce7c80daee32122e873f60a48a69d

Only package gcno files for gcov coverage builds.

Bug: 154550223
Test: m -j NATIVE_COVERAGE=true droid dist tests
Test: m -j CLANG_COVERAGE=true droid dist tests
Merged-In: I81598bcab8db105de6692156c001fc961409ce63
Change-Id: I81598bcab8db105de6692156c001fc961409ce63

cc/coverage.go

diff --git a/cc/coverage.go b/cc/coverage.go
index b94b628..bde07fd 100644
--- a/cc/coverage.go
+++ b/cc/coverage.go
@@ -82,10 +82,10 @@
 	}
 
 	if cov.Properties.CoverageEnabled {
-		flags.Coverage = true
 		cov.linkCoverage = true
 
 		if gcovCoverage {
+			flags.GcovCoverage = true
 			flags.Local.CommonFlags = append(flags.Local.CommonFlags, "--coverage", "-O0")
 
 			// Override -Wframe-larger-than and non-default optimization