From 9f09316ffcd39b98dbbae009befc94e9d747ec3a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 1 Nov 2022 16:14:33 -0700 Subject: [PATCH] HACK: use arm64 prebuilts from apex sets for riscv64 There are no riscv64 prebuilts in apex sets, use arm64 ones for now. Test: lunch aosp_riscv64-userdebug && m droid dist Change-Id: Iee2d669e01d93504642223939857634b7fd1c1ba --- java/app_set.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/app_set.go b/java/app_set.go index d99fadb34..d8c2a8d3c 100644 --- a/java/app_set.go +++ b/java/app_set.go @@ -90,9 +90,10 @@ func (as *AndroidAppSet) APKCertsFile() android.Path { } var TargetCpuAbi = map[string]string{ - "arm": "ARMEABI_V7A", - "arm64": "ARM64_V8A", - "riscv64": "RISCV64", + "arm": "ARMEABI_V7A", + "arm64": "ARM64_V8A", + // TODO: use "RISCV64" when that is supported in bundles + "riscv64": "ARM64_V8A", "x86": "X86", "x86_64": "X86_64", }