Merge "Link libc++demangle with libc++ for the device."

am: 400c218219 Change-Id: I3f736121bf894a57a6d066672fb8a61d08adbce5
2019-08-21 17:25:35 -07:00
parent 074651ba13 400c218219
commit 68e9a68014
1 changed files with 1 additions and 0 deletions
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -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