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

HACK: use arm64 apex prebuilts for riscv64

Browse Source 
There are no riscv64 apex prebuilts, which breaks the build when
provenance_metadata singelton tries to run a tool on all the input
apexes that don't exist.  Hack it to provide the arm64 apex for now
if no riscv64 apex is specified, which will allow the build to pass.

Test: lunch aosp_riscv64-userdebug && m droid
Change-Id: Ic39936539803615ea4b7f817daf7b59ab7c40e7e
This commit is contained in:
Colin Cross
2022-11-01 09:26:51 -07:00
parent 8238ae869e
commit abacbe8436
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: