Merge "Revert "Use prebuilt NDK libc++ for rv64."" into main

This commit is contained in:
Mark White 2023-07-26 08:44:04 +00:00 committed by Gerrit Code Review
commit 634828f3f9

View file

@ -80,7 +80,8 @@ func (stl *stl) begin(ctx BaseModuleContext) {
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"