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

Commit 00c871be authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" am: 39ac1faf am: fcb16db6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3734ad3fee9c975e1793dfc8aee62649152b9209
parents 42ced0a6 fcb16db6

core/cxx_stl_setup.mk

+2 −8
Original line number Diff line number Diff line
@@ -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