commit 75b36c165fbb11a1aa52b5329473cf4f688183e2
author Liz Kammer <eakammer@google.com> Tue Mar 21 09:12:53 2023 -0400
committer Liz Kammer <eakammer@google.com> Tue Mar 21 09:28:14 2023 -0400
tree 52c30cc87d569d4abb41a980e75a2d5d1c88fae4
parent 94d107020a41115dde1202b94c5fa80680bff808

Disable riscv in all Bazel mixed builds

Bug: 262192655
Test: CI
Change-Id: Ie46eb661f968396f40458d674897b554be8d47c3

android/bazel.go

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