diff options
| author | 2020-06-16 17:51:46 -0700 | |
|---|---|---|
| committer | 2020-06-22 11:13:42 -0700 | |
| commit | 1a6acd4f39b8ea2b030444deb4ecdb0af652e5aa (patch) | |
| tree | 7f7671a15e3f9d72af1a8c67807f15f80bc8605f /android/variable.go | |
| parent | 181c2a40d8465372a44ee34109c7ea1d7b9ce21d (diff) | |
Make native_coverage clause work with ClangCoverage
Make uses NATIVE_COVERAGE to enable gcov coverage and CLANG_COVERAGE
to enable clang coverage. NATIVE_COVERAGE is translated to the Soong
Native_coverage product variable which triggers the native_coverage
clause in Android.bp files. The clause also needs to be triggered
for CLANG_COVERAGE.
Rename the existing Native_coverage product variable to GcovCoverage,
and regenerate Native_coverage when either GcovCoverage or
ClangCoverage are set.
Also remove NativeLineCoverage, it wasn't doing anything differently
than Native_coverage.
Bug: 159059537
Test: m checkbuild
Change-Id: I215124a9b35a2ad50ad562079d392e3d33da11f4
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/variable.go b/android/variable.go index b2149c3ff..2c8bd0720 100644 --- a/android/variable.go +++ b/android/variable.go @@ -270,12 +270,14 @@ type productVariables struct { JavaCoveragePaths []string `json:",omitempty"` JavaCoverageExcludePaths []string `json:",omitempty"` - NativeLineCoverage *bool `json:",omitempty"` - Native_coverage *bool `json:",omitempty"` + GcovCoverage *bool `json:",omitempty"` ClangCoverage *bool `json:",omitempty"` NativeCoveragePaths []string `json:",omitempty"` NativeCoverageExcludePaths []string `json:",omitempty"` + // Set by NewConfig + Native_coverage *bool + SanitizeHost []string `json:",omitempty"` SanitizeDevice []string `json:",omitempty"` SanitizeDeviceDiag []string `json:",omitempty"` |