StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt""

Browse Source
This commit is contained in:
Ryan Prichard
2021-04-01 22:42:33 +00:00
committed by Gerrit Code Review
parent 98c8507215 6d74870a67
commit f56f074e06
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/binary.mk
View File

@@ -266,10 +266,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
endif endif
endif endif
ifneq (,$(filter armeabi armeabi-v7a,$(my_cpu_variant)))
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
endif
my_ldlibs += -ldl my_ldlibs += -ldl
else # LOCAL_NDK_STL_VARIANT must be none else # LOCAL_NDK_STL_VARIANT must be none
# Do nothing. # Do nothing.

10
core/cxx_stl_setup.mk
View File

@@ -82,15 +82,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
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.
# 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
else
my_static_libraries += libgcc_stripped
my_ldflags += -Wl,--exclude-libs,libgcc_stripped.a
endif
else ifeq ($(my_cxx_stl),libstdc++) else ifeq ($(my_cxx_stl),libstdc++)
$(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported) $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported)
else ifeq ($(my_cxx_stl),none) else ifeq ($(my_cxx_stl),none)