diff options
| author | Kun Niu <kunniu@google.com> | 2021-08-06 19:12:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-08-06 19:12:27 +0000 |
| commit | fe1d6c535c3aa92c2c12db9590ab8a8fae9bb9cd (patch) | |
| tree | bfc7b29ff200d81db6a301e4bb8d8b66ef53a327 | |
| parent | 0c49dac503844790dc9520be91100d600b9f2ad0 (diff) | |
| parent | ce1dcf6a9f63bff8ca68e1256e208c750d22817e (diff) | |
| download | soong-fe1d6c535c3aa92c2c12db9590ab8a8fae9bb9cd.tar.gz | |
Merge "Use prebuild modules even when coverage is enabled." into sc-dev
| -rw-r--r-- | apex/prebuilt.go | 4 |
1 files changed, 0 insertions, 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")) |