Merge "Revert "Use prebuilt NDK libc++ for rv64."" into main

2023-07-26 08:44:04 +00:00
parent 8fbc42cfd7 967e16f3d8
commit 634828f3f9
1 changed files with 2 additions and 1 deletions
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -80,7 +80,8 @@ func (stl *stl) begin(ctx BaseModuleContext) {
 			return ""
 		}
 		s = deduplicateStlInput(s)
-		if ctx.useSdk() && ctx.Device() {
+		archHasNDKStl := ctx.Arch().ArchType != android.Riscv64
+		if ctx.useSdk() && ctx.Device() && archHasNDKStl {
 			switch s {
 			case "", "system":
 				return "ndk_system"