diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-08 03:16:41 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-08 03:16:41 +0000 |
| commit | 58986b02c697cd86ed6a9c94f8432b03d62cdd64 (patch) | |
| tree | 5007c83626fb694fa9c15cfc27d56401728b3232 | |
| parent | da58d813a95dfba4af244d17bedf88c0f52c09a9 (diff) | |
| parent | 1e8fd726dd17e0a5323560e001be6ab989869add (diff) | |
| download | build_soong-58986b02c697cd86ed6a9c94f8432b03d62cdd64.tar.gz build_soong-58986b02c697cd86ed6a9c94f8432b03d62cdd64.tar.bz2 build_soong-58986b02c697cd86ed6a9c94f8432b03d62cdd64.zip | |
Snap for 5787825 from 1e8fd726dd17e0a5323560e001be6ab989869add to qt-qpr1-release
Change-Id: I0cb9dbc70140dccc2b749c8c9f9ba5bbdc6624e6
| -rw-r--r-- | apex/apex.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index c6a1f464..e97862c4 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1346,6 +1346,10 @@ func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { // 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 forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) || android.InList("hwaddress", ctx.Config().SanitizeDevice()) |