am fec60529: Merge "Fix missing symbol for debug malloc."

* commit 'fec605294e894fae1f1d5b59afe78af8fa84e4fa':
  Fix missing symbol for debug malloc.
This commit is contained in:
Christopher Ferris 2014-12-10 20:38:17 +00:00 committed by Android Git Automerger
commit ca5edfb23b

View File

@ -1178,7 +1178,7 @@ LOCAL_CXX_STL := none
LOCAL_SYSTEM_SHARED_LIBRARIES :=
# Only need this for arm since libc++ uses its own unwind code that
# doesn't mix with the other default unwind code.
LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm libc++abi
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# Don't install on release build