From 08e634d5ce83a866fcc54889ddfd79ff007da60b Mon Sep 17 00:00:00 2001 From: Prashanth Swaminathan Date: Wed, 26 Jul 2023 09:42:41 -0700 Subject: [PATCH] Revert "Revert "Use prebuilt NDK libc++ for rv64."" This reverts commit 967e16f3d85fd58b128c19595274f0c9bb9a19d8. Change-Id: I78cb0176fd21a8c0c376bee76631621712aeddaa --- cc/stl.go | 3 +-- 1 file changed, 1 insertion(+), 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"