Merge "Disable riscv in all Bazel mixed builds"

2023-03-22 12:19:26 +00:00
parent 1cb8b5b57a 75b36c165f
commit 9d8e0158de
1 changed files with 1 additions and 0 deletions
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -357,6 +357,7 @@ func MixedBuildsEnabled(ctx BaseModuleContext) bool {
 	mixedBuildEnabled := ctx.Config().IsMixedBuildsEnabled() &&
 		ctx.Os() != Windows && // Windows toolchains are not currently supported.
 		ctx.Os() != LinuxBionic && // Linux Bionic toolchains are not currently supported.
+		ctx.Arch().ArchType != Riscv64 && // TODO(b/262192655) Riscv64 toolchains are not currently supported.
 		module.Enabled() &&
 		convertedToBazel(ctx, module) &&
 		ctx.Config().BazelContext.IsModuleNameAllowed(module.Name(), withinApex)