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 "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: 252831b03a 

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

Change-Id: I5b330c63f7ac37ed479cc776d6f642f1419de5b5
This commit is contained in:
Ryan Prichard 2021-04-01 23:19:45 +00:00 committed by Automerger Merge Worker
parent 2b4fc842c3 252831b03a
commit a9cf131c22
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) { 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))
} }