summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Albert <danalbert@google.com> 2023-07-25 22:12:47 +0000
committer Dan Albert <danalbert@google.com> 2023-07-25 22:12:47 +0000
commit5757c0cf9acdc7ec524a3d45e66bedf00db730e7 (patch)
tree3b6bfd6f5fe5248df79555174f4f897fc123fbbc
parenta96a2677b667629c8ed7f87ac4a114f886c80de4 (diff)
Use prebuilt NDK libc++ for rv64.
Bug: None Test: None Change-Id: Iebd8bce9a72a2206dfb3c6311ec9139f018df6a8
-rw-r--r--cc/stl.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/stl.go b/cc/stl.go
index ffc7c76ab..8f92dcb40 100644
--- a/cc/stl.go
+++ b/cc/stl.go
@@ -80,8 +80,7 @@ func (stl *stl) begin(ctx BaseModuleContext) {
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"