Revert "Revert "Use prebuilt NDK libc++ for rv64."" am: 08e634d5ce am: 04cc93c7e1 am: d191c0713f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677915

Change-Id: I0eb7cb6217d8952cdd15f399535d6a0a43b48ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Prashanth Swaminathan
2023-07-27 20:51:35 +00:00
committed by Automerger Merge Worker

View File

@@ -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"