commit c4dbbd6aad04052f239627b65ec7cd6448da2777
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 14 20:01:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 14 20:01:55 2023 +0000
tree d9c5fafc8c833fcdaf19ad0961ba9fb47eab1b06
parent b8f30a1549614c593234a3d168d48be9fbe9dc36
parent f4a5b8247b3111ec999cd3e176f46e12637bc04b

Merge "Omit linux_bionic in mixed builds." am: 261bc29678 am: b6c1361030 am: f4a5b8247b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2487575

Change-Id: Ie3ea97752a4c6167ad76dc531970ab95a84e91e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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)