diff --git a/android/bazel.go b/android/bazel.go index 782632b0b..1a71defcb 100644 --- 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)