openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt" am: 368b7e6a13 am: 1ef79d5171 am: 6f23a7332e 

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

Change-Id: Ie4987e20fcbf288817a3ad5c401929a89d6aa727
This commit is contained in:
Dan Albert 2021-03-31 00:20:17 +00:00 committed by Automerger Merge Worker
parent b9c5948498 6f23a7332e
commit 667fd9bdae
1 changed files with 1 additions and 6 deletions
Show Stats 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) {
deps.StaticLibs = append(deps.StaticLibs, "ndk_libandroid_support")
}
// TODO: Switch the NDK over to the LLVM unwinder for non-arm32 architectures.
if ctx.Arch().ArchType == android.Arm {
deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind")
} else {
deps.StaticLibs = append(deps.StaticLibs, "libgcc_stripped")
}
deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind")
default:
panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl))
}