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

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

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

Change-Id: I35907111af472dc55166c7fbe7f5c41c39a5967d
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:00:30 +00:00
committed by Automerger Merge Worker
parent 1db5a3befc 04cc93c7e1
commit d191c0713f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/stl.go
View File

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