StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Treehugger Robot
2023-03-14 20:01:55 +00:00
committed by Automerger Merge Worker
parent b8f30a1549 f4a5b8247b
commit c4dbbd6aad
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/bazel.go
View File

@@ -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)