commit a2aaa2fdefa8496820a6e9910765b8f2de2020b2
author Colin Cross <ccross@android.com> Mon Oct 03 12:41:50 2022 -0700
committer Colin Cross <ccross@android.com> Tue Oct 04 10:53:07 2022 -0700
tree 5bb8defd87c92f8e8007e4c2231fed726ed4a750
parent b9238c0b72432a3569132fdc962dd5792341d0ba

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

diff --git a/java/app_set.go b/java/app_set.go
index 694b167..d99fadb 100644
--- a/java/app_set.go
+++ b/java/app_set.go
@@ -90,10 +90,11 @@
 }
 
 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 {