commit 261bc296781de825b6e7546060d7dab10cb1df1a
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 14 18:07:17 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 14 18:07:17 2023 +0000
tree 7d267b74c21c496ae457e989c88ffad2f59e1659
parent a8c1cacaf9c20860d19a327ea83ee83e5f7d3b1f
parent 11ec91f652c749c299dc227af3708777bb750e8e

Merge "Omit linux_bionic in mixed builds."

android/bazel.go

diff --git a/android/bazel.go b/android/bazel.go
index b600758..782632b 100644
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -356,6 +356,7 @@
 	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)