diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-08 03:05:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-08 03:05:35 +0000 |
| commit | a97b1d18d17b6f927c5c0a0200f5f4a6efa011ab (patch) | |
| tree | 5007c83626fb694fa9c15cfc27d56401728b3232 | |
| parent | a2caa08402966d28a645362e804bc1287354a9f1 (diff) | |
| parent | 97f3652c7b33945d6966c835621b622ff89cd4f4 (diff) | |
| download | build_soong-a97b1d18d17b6f927c5c0a0200f5f4a6efa011ab.tar.gz build_soong-a97b1d18d17b6f927c5c0a0200f5f4a6efa011ab.tar.bz2 build_soong-a97b1d18d17b6f927c5c0a0200f5f4a6efa011ab.zip | |
Snap for 5788294 from 97f3652c7b33945d6966c835621b622ff89cd4f4 to qt-c2f2-release
Change-Id: I78975e871bafa37aceef6171a445c56b5ac56462
| -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()) |