Merge "Build module from source branch instead of using prebuilds when coverage is enabled."

am: a535be6012

Change-Id: Ia5f294ceec3d15f7455792a91eef1330e0131f4f
This commit is contained in:
Kun Niu 2019-08-05 11:38:53 -07:00 committed by android-build-merger
commit fb6a70e5a1

View file

@ -1497,6 +1497,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())