From a2aaa2fdefa8496820a6e9910765b8f2de2020b2 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 3 Oct 2022 12:41:50 -0700 Subject: Fix panics when target arch is riscv64 Fix panics in api_level.go and apex.go when using riscv64 as the target arch. Bug: 250918230 Test: lunch aosp_riscv64-userdebug && m ALLOW_MISSING_DEPENDENCIES=true nothing Change-Id: I85c7685f3d14fa2dc7ffbcdea7f490feca304ef7 --- java/app_set.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'java/app_set.go') diff --git a/java/app_set.go b/java/app_set.go index 694b1670e..d99fadb34 100644 --- a/java/app_set.go +++ b/java/app_set.go @@ -90,10 +90,11 @@ func (as *AndroidAppSet) APKCertsFile() android.Path { } var TargetCpuAbi = map[string]string{ - "arm": "ARMEABI_V7A", - "arm64": "ARM64_V8A", - "x86": "X86", - "x86_64": "X86_64", + "arm": "ARMEABI_V7A", + "arm64": "ARM64_V8A", + "riscv64": "RISCV64", + "x86": "X86", + "x86_64": "X86_64", } func SupportedAbis(ctx android.ModuleContext) []string { -- cgit v1.2.3-59-g8ed1b