From ce1dcf6a9f63bff8ca68e1256e208c750d22817e Mon Sep 17 00:00:00 2001 From: Kun Niu Date: Thu, 5 Aug 2021 18:15:28 +0000 Subject: [PATCH] Use prebuild modules even when coverage is enabled. Bug: 194323871 Test: local build passed. Change-Id: I94a3922453473de7d754afce4b05ac3b6ae3765d --- apex/prebuilt.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 30fd359b5..c567fe012 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -133,10 +133,6 @@ func (p *prebuiltCommon) checkForceDisable(ctx android.ModuleContext) bool { // to build the prebuilts themselves. forceDisable = forceDisable || ctx.Config().UnbundledBuild() - // Force disable the prebuilts when coverage is enabled. - forceDisable = forceDisable || ctx.DeviceConfig().NativeCoverageEnabled() - forceDisable = forceDisable || ctx.Config().IsEnvTrue("EMMA_INSTRUMENT") - // b/137216042 don't use prebuilts when address sanitizer is on, unless the prebuilt has a sanitized source sanitized := ctx.Module().(sanitizedPrebuilt) forceDisable = forceDisable || (android.InList("address", ctx.Config().SanitizeDevice()) && !sanitized.hasSanitizedSource("address"))