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

This commit is contained in:
Kun Niu
2019-08-05 18:04:49 +00:00
committed by Gerrit Code Review

View File

@@ -1497,6 +1497,10 @@ func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) {
// to build the prebuilts themselves. // to build the prebuilts themselves.
forceDisable = forceDisable || ctx.Config().UnbundledBuild() 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 // b/137216042 don't use prebuilts when address sanitizer is on
forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) || forceDisable = forceDisable || android.InList("address", ctx.Config().SanitizeDevice()) ||
android.InList("hwaddress", ctx.Config().SanitizeDevice()) android.InList("hwaddress", ctx.Config().SanitizeDevice())