Merge "Omit linux_bionic in mixed builds."
This commit is contained in:
@@ -356,6 +356,7 @@ func MixedBuildsEnabled(ctx BaseModuleContext) bool {
|
|||||||
withinApex := !apexInfo.IsForPlatform()
|
withinApex := !apexInfo.IsForPlatform()
|
||||||
mixedBuildEnabled := ctx.Config().IsMixedBuildsEnabled() &&
|
mixedBuildEnabled := ctx.Config().IsMixedBuildsEnabled() &&
|
||||||
ctx.Os() != Windows && // Windows toolchains are not currently supported.
|
ctx.Os() != Windows && // Windows toolchains are not currently supported.
|
||||||
|
ctx.Os() != LinuxBionic && // Linux Bionic toolchains are not currently supported.
|
||||||
module.Enabled() &&
|
module.Enabled() &&
|
||||||
convertedToBazel(ctx, module) &&
|
convertedToBazel(ctx, module) &&
|
||||||
ctx.Config().BazelContext.IsModuleNameAllowed(module.Name(), withinApex)
|
ctx.Config().BazelContext.IsModuleNameAllowed(module.Name(), withinApex)
|
||||||
|
Reference in New Issue
Block a user