aboutsummaryrefslogtreecommitdiffstats
path: root/libc/Android.mk
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-05 12:05:34 -0800
committerElliott Hughes <enh@google.com>2015-02-05 12:05:34 -0800
commit6e54c3e519892ca13f15bdcea0d431befbadac25 (patch)
tree914bdd8c31ba4d8cd205fefb8f0b95669a425189 /libc/Android.mk
parent8e5f9bc8a46872e3f0ac4799558fdfd5999f9c20 (diff)
downloadandroid_bionic-6e54c3e519892ca13f15bdcea0d431befbadac25.tar.gz
android_bionic-6e54c3e519892ca13f15bdcea0d431befbadac25.tar.bz2
android_bionic-6e54c3e519892ca13f15bdcea0d431befbadac25.zip
Use the libcxxabi __cxa_demangle.
Bug: 18930951 Change-Id: If2ea3633ac6dfd4ec975c0f16bdf3dd58e05c614
Diffstat (limited to 'libc/Android.mk')
-rw-r--r--libc/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/Android.mk b/libc/Android.mk
index fc4940abd..afd586ee2 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1221,7 +1221,8 @@ 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 libc++abi
+LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
+LOCAL_STATIC_LIBRARIES += libc++abi
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# Don't install on release build