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

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 2e54e7e..8bad6ed 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -286,6 +286,9 @@
 		Arm64 struct {
 			ApexNativeDependencies
 		}
+		Riscv64 struct {
+			ApexNativeDependencies
+		}
 		X86 struct {
 			ApexNativeDependencies
 		}
@@ -787,6 +790,8 @@
 			depsList = append(depsList, a.archProperties.Arch.Arm.ApexNativeDependencies)
 		case android.Arm64:
 			depsList = append(depsList, a.archProperties.Arch.Arm64.ApexNativeDependencies)
+		case android.Riscv64:
+			depsList = append(depsList, a.archProperties.Arch.Riscv64.ApexNativeDependencies)
 		case android.X86:
 			depsList = append(depsList, a.archProperties.Arch.X86.ApexNativeDependencies)
 		case android.X86_64:

cc/api_level.go

diff --git a/cc/api_level.go b/cc/api_level.go
index fd145a9..8c2b2c2 100644
--- a/cc/api_level.go
+++ b/cc/api_level.go
@@ -28,6 +28,8 @@
 		return ctx.Config().MinSupportedSdkVersion()
 	case android.Arm64, android.X86_64:
 		return android.FirstLp64Version
+	case android.Riscv64:
+		return android.FutureApiLevel
 	default:
 		panic(fmt.Errorf("Unknown arch %q", arch))
 	}

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 {

rust/config/riscv64_device.go

diff --git a/rust/config/riscv64_device.go b/rust/config/riscv64_device.go
index 3b41a10..d014dbf 100644
--- a/rust/config/riscv64_device.go
+++ b/rust/config/riscv64_device.go
@@ -25,7 +25,7 @@
 	Riscv64ArchFeatureRustFlags = map[string][]string{"": {}}
 	Riscv64LinkFlags            = []string{}
 
-	Riscv64ArchVariantRustFlags = map[string][]string{}
+	Riscv64ArchVariantRustFlags = map[string][]string{"": {}}
 )
 
 func init() {