Merge "Omit linux_bionic in mixed builds."

2023-03-14 18:07:17 +00:00
parent a8c1cacaf9 11ec91f652
commit 261bc29678
1 changed files with 1 additions and 0 deletions
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -356,6 +356,7 @@ func MixedBuildsEnabled(ctx BaseModuleContext) bool {
 	withinApex := !apexInfo.IsForPlatform()
 	mixedBuildEnabled := ctx.Config().IsMixedBuildsEnabled() &&
 		ctx.Os() != Windows && // Windows toolchains are not currently supported.
+		ctx.Os() != LinuxBionic && // Linux Bionic toolchains are not currently supported.
 		module.Enabled() &&
 		convertedToBazel(ctx, module) &&
 		ctx.Config().BazelContext.IsModuleNameAllowed(module.Name(), withinApex)