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

This commit is contained in:
Treehugger Robot
2019-08-21 23:54:48 +00:00
committed by Gerrit Code Review

View File

@@ -84,6 +84,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_ldflags += -nodefaultlibs my_ldflags += -nodefaultlibs
my_cxx_ldlibs += $($($(my_prefix)OS)_$(my_link_type)_gcclibs) my_cxx_ldlibs += $($($(my_prefix)OS)_$(my_link_type)_gcclibs)
else else
my_static_libraries += libc++demangle
ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
my_static_libraries += libunwind_llvm my_static_libraries += libunwind_llvm
my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a