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

Commit ee63f423 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Link libc++demangle with libc++ for the device." am: 400c2182 am:... 

Merge "Link libc++demangle with libc++ for the device." am: 400c2182 am: 68e9a680 am: 40c266b9
am: 46b8dd55

Change-Id: I95a27baa730fd8c5a352299b0cdc292e14d3d04a
parents d75c0bf0 46b8dd55

core/cxx_stl_setup.mk

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) 
        my_ldflags += -nodefaultlibs

        my_cxx_ldlibs += $($($(my_prefix)OS)_$(my_link_type)_gcclibs)

    else

        my_static_libraries += libc++demangle

        ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

            my_static_libraries += libunwind_llvm

            my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a