commit 08e634d5ce83a866fcc54889ddfd79ff007da60b
author Prashanth Swaminathan <prashanthsw@google.com> Wed Jul 26 09:42:41 2023 -0700
committer Prashanth Swaminathan <prashanthsw@google.com> Wed Jul 26 09:43:15 2023 -0700
tree 87cc1ced364f9da15a06ee09d7abe3893440adad
parent ed83eba40fa8a98581850ca8b696f395badd3dfb

Revert "Revert "Use prebuilt NDK libc++ for rv64.""

This reverts commit 967e16f3d85fd58b128c19595274f0c9bb9a19d8.

Change-Id: I78cb0176fd21a8c0c376bee76631621712aeddaa

cc/stl.go

diff --git a/cc/stl.go b/cc/stl.go
index ffc7c76..8f92dcb 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -80,8 +80,7 @@
 			return ""
 		}
 		s = deduplicateStlInput(s)
-		archHasNDKStl := ctx.Arch().ArchType != android.Riscv64
-		if ctx.useSdk() && ctx.Device() && archHasNDKStl {
+		if ctx.useSdk() && ctx.Device() {
 			switch s {
 			case "", "system":
 				return "ndk_system"