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

Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: 252831b03a am: a9cf131c22

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

Change-Id: Iac78177070c3ae46106b7e12bfa7ebc649d74376
This commit is contained in:
Ryan Prichard
2021-04-02 00:05:52 +00:00
committed by Automerger Merge Worker
parent 3c372f7968 a9cf131c22
commit 81d7a5336d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/stl.go
View File

@@ -188,12 +188,7 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
if needsLibAndroidSupport(ctx) { if needsLibAndroidSupport(ctx) {
deps.StaticLibs = append(deps.StaticLibs, "ndk_libandroid_support") deps.StaticLibs = append(deps.StaticLibs, "ndk_libandroid_support")
} }
// TODO: Switch the NDK over to the LLVM unwinder for non-arm32 architectures. deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind")
if ctx.Arch().ArchType == android.Arm {
deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind")
} else {
deps.StaticLibs = append(deps.StaticLibs, "libgcc_stripped")
}
default: default:
panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl)) panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl))
} }