aboutsummaryrefslogtreecommitdiffstats
path: root/java/app.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2020-06-16 17:51:46 -0700
committerOliver Nguyen <olivernguyen@google.com>2020-07-02 11:21:36 -0700
commit72cabc625599fafc1f1f56c74938a8b11946d7ca (patch)
treec8cfb5bad2e27565738d893970eb4182de92d2ca /java/app.go
parent583691a0603940c114b882543089bd56790d25a3 (diff)
downloadbuild_soong-72cabc625599fafc1f1f56c74938a8b11946d7ca.tar.gz
build_soong-72cabc625599fafc1f1f56c74938a8b11946d7ca.tar.bz2
build_soong-72cabc625599fafc1f1f56c74938a8b11946d7ca.zip
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 Merged-In: I215124a9b35a2ad50ad562079d392e3d33da11f4 Change-Id: I215124a9b35a2ad50ad562079d392e3d33da11f4
Diffstat (limited to 'java/app.go')
-rwxr-xr-xjava/app.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go
index e2e3a53d..eaac2091 100755
--- a/java/app.go
+++ b/java/app.go
@@ -947,7 +947,7 @@ func (a *AndroidApp) Privileged() bool {
}
func (a *AndroidApp) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool {
- return ctx.Device() && (ctx.DeviceConfig().NativeCoverageEnabled() || ctx.DeviceConfig().ClangCoverageEnabled())
+ return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled()
}
func (a *AndroidApp) PreventInstall() {