From 6f19c3e06f0a4633a3ec178a0aed8dd3affb6da9 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Wed, 16 Dec 2020 03:37:40 -0800 Subject: [PATCH] Switch platform EH unwinder to prebuilt LLVM libunwind Bug: http://b/153025717 Test: device boots Change-Id: I8efa33c8375d67a24eb7f6e7512d6149d718a467 --- core/cxx_stl_setup.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index a2abb1a32..f71ef72f5 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -78,18 +78,12 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) my_static_libraries += libc++demangle ifeq ($(my_link_type),static) - my_static_libraries += libm libc - ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) - my_static_libraries += libunwind_llvm - my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a - else - my_static_libraries += libgcc_stripped - my_ldflags += -Wl,--exclude-libs,libgcc_stripped.a - endif + my_static_libraries += libm libc libunwind endif endif else ifeq ($(my_cxx_stl),ndk) # Using an NDK STL. Handled in binary.mk, except for the unwinder. + # TODO: Switch the NDK over to the LLVM unwinder for non-arm32 architectures. ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) my_static_libraries += libunwind_llvm my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a