From 4ccd490ae5c8a987af2a573ae959cc5e13190157 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Wed, 31 Mar 2021 15:29:11 -0700 Subject: [PATCH] Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt" This reverts commit 74bdc288173adfbf6b9185f26c376428a8a1a077. Bug: http://b/153025717 Test: treehugger Change-Id: I11410f213732c52755a3bd3d4d0769570354484e --- cc/stl.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cc/stl.go b/cc/stl.go index 75fab1702..594231d78 100644 --- a/cc/stl.go +++ b/cc/stl.go @@ -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)) }