tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" am: 39ac1faf76 am: fcb16db6c1 am: 00c871bee8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1551261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7c8af3850045c5f7eff57afbcc826813ed9f9b7
This commit is contained in:
Ryan Prichard 2021-01-20 02:15:55 +00:00 committed by Automerger Merge Worker
commit adae9335d3
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
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