Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d8e0158 authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Disable riscv in all Bazel mixed builds"

parents 1cb8b5b5 75b36c16

android/bazel.go

+1 −0
Original line number Diff line number Diff line
@@ -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)