commit fec605294e894fae1f1d5b59afe78af8fa84e4fa
author Christopher Ferris <cferris@google.com> Wed Dec 10 20:33:52 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 10 20:33:52 2014 +0000
tree 8405d0ffb48c747e734fb5ea8f7cafa3437c200e
parent 3a49cfe3f2121039900ac8b0340b538b01da35c9
parent 3f61f89b559551164b13441ff4ff02ed0718530a

Merge "Fix missing symbol for debug malloc."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 6863151..cc1585c 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1178,7 +1178,7 @@
 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