diff options
| author | 2020-06-16 17:51:46 -0700 | |
|---|---|---|
| committer | 2020-06-22 11:13:42 -0700 | |
| commit | 1a6acd4f39b8ea2b030444deb4ecdb0af652e5aa (patch) | |
| tree | 7f7671a15e3f9d72af1a8c67807f15f80bc8605f /apex/apex.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 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index a4af7aa35..840dd4983 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1553,7 +1553,7 @@ func (a *apexBundle) AddSanitizerDependencies(ctx android.BottomUpMutatorContext var _ cc.Coverage = (*apexBundle)(nil) func (a *apexBundle) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool { - return ctx.Device() && (ctx.DeviceConfig().NativeCoverageEnabled() || ctx.DeviceConfig().ClangCoverageEnabled()) + return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled() } func (a *apexBundle) PreventInstall() { |