p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch platform EH unwinder to prebuilt LLVM libunwind 

Bug: http://b/153025717
Test: device boots
Change-Id: I8efa33c8375d67a24eb7f6e7512d6149d718a467
This commit is contained in:
Ryan Prichard 2020-12-16 03:37:40 -08:00
parent 9d2219c2da
commit 6f19c3e06f
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/cxx_stl_setup.mk
View File

@ -78,18 +78,12 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_static_libraries += libc++demangle my_static_libraries += libc++demangle
ifeq ($(my_link_type),static) ifeq ($(my_link_type),static)
my_static_libraries += libm libc my_static_libraries += libm libc libunwind
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
endif endif
endif endif
else ifeq ($(my_cxx_stl),ndk) else ifeq ($(my_cxx_stl),ndk)
# Using an NDK STL. Handled in binary.mk, except for the unwinder. # 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)) ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
my_static_libraries += libunwind_llvm my_static_libraries += libunwind_llvm
my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a