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

Merge "Disable musl in mixed Bazel builds"

Browse Source
This commit is contained in:
Treehugger Robot
2023-03-23 06:35:30 +00:00
committed by Gerrit Code Review
parent 5c309aa37a 9e87f0a6ea
commit 62d3353434
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

@@ -357,6 +357,7 @@ func MixedBuildsEnabled(ctx BaseModuleContext) bool {
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. ctx.Os() != LinuxBionic && // Linux Bionic toolchains are not currently supported.
ctx.Os() != LinuxMusl && // Linux musl toolchains are not currently supported (b/259266326).
ctx.Arch().ArchType != Riscv64 && // TODO(b/262192655) Riscv64 toolchains are not currently supported. ctx.Arch().ArchType != Riscv64 && // TODO(b/262192655) Riscv64 toolchains are not currently supported.
module.Enabled() && module.Enabled() &&
convertedToBazel(ctx, module) && convertedToBazel(ctx, module) &&