commit 967e16f3d85fd58b128c19595274f0c9bb9a19d8
author NaYoung Yun <nayoungy@google.com> Wed Jul 26 03:07:42 2023 +0000
committer NaYoung Yun <nayoungy@google.com> Wed Jul 26 03:36:47 2023 +0000
tree c8ab6efee1b271c4d0f68a8083f09a0e6656df07
parent 5757c0cf9acdc7ec524a3d45e66bedf00db730e7

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

Revert submission 2676418-hack-rv64-libc++

Reason for revert: build break

Reverted changes: /q/submissionid:2676418-hack-rv64-libc%252B%252B

Change-Id: Idd7a5fd3b1687e2a31aa3c036d5d851fb5bbe283
Bug: 293214158
Bug: 293214503
Bug: 293214158
Bug: 293219471

cc/stl.go

diff --git a/cc/stl.go b/cc/stl.go
index 8f92dcb..ffc7c76 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -80,7 +80,8 @@
 			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"