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

Merge "Revert "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: cf5487e07f am: 4637ec0d30

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

Change-Id: Ib4de6cd44fbc8feda4d8ccd92d98c58b01bc30fd
This commit is contained in:
Ryan Prichard
2021-03-31 05:53:09 +00:00
committed by Automerger Merge Worker
parent a1f6052853 4637ec0d30
commit 619b6c54cd
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/binary.mk
View File

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

10
core/cxx_stl_setup.mk
View File

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