Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4637ec0d authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8c535beddd2c435f8a557bd189d8c369049a4634
parents cece85f7 cf5487e0

core/binary.mk

+4 −1
Original line number Diff line number Diff line
@@ -266,7 +266,10 @@ ifneq ($(LOCAL_SDK_VERSION),) 
      endif

    endif



    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.

core/cxx_stl_setup.mk

+9 −1
Original line number Diff line number Diff line
@@ -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)