StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "HACK: use arm64 apex prebuilts for riscv64" am: cc7a5dcf44

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2281571

Change-Id: I73464238cb8b4beeb60402096c789adea361ab0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-11-01 23:05:10 +00:00
committed by Automerger Merge Worker
parent fdf18a5e46 cc7a5dcf44
commit cb29876dcb
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/prebuilt.go
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: