Merge "HACK: use arm64 apex prebuilts for riscv64"

This commit is contained in:
Colin Cross 2022-11-01 22:15:07 +00:00 committed by Gerrit Code Review
commit cc7a5dcf44

View file

@ -532,6 +532,10 @@ func (p *ApexFileProperties) prebuiltApexSelector(ctx android.BaseModuleContext,
src = String(p.Arch.Arm64.Src)
case android.Riscv64:
src = String(p.Arch.Riscv64.Src)
// HACK: fall back to arm64 prebuilts, the riscv64 ones don't exist yet.
if src == "" {
src = String(p.Arch.Arm64.Src)
}
case android.X86:
src = String(p.Arch.X86.Src)
case android.X86_64: