StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark White
2023-07-26 08:44:04 +00:00
committed by Gerrit Code Review
parent 8fbc42cfd7 967e16f3d8
commit 634828f3f9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/stl.go
View File

@@ -80,7 +80,8 @@ func (stl *stl) begin(ctx BaseModuleContext) {
return "" return ""
} }
s = deduplicateStlInput(s) s = deduplicateStlInput(s)
if ctx.useSdk() && ctx.Device() { archHasNDKStl := ctx.Arch().ArchType != android.Riscv64
if ctx.useSdk() && ctx.Device() && archHasNDKStl {
switch s { switch s {
case "", "system": case "", "system":
return "ndk_system" return "ndk_system"