Merge "Revert "Use prebuilt NDK libc++ for rv64."" into main
This commit is contained in:
commit
634828f3f9
1 changed files with 2 additions and 1 deletions
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue