commit 6ecd1cd195546ecaf4317beda3f1a1a27f1d0d57
author Christopher Ferris <cferris@google.com> Wed Aug 27 21:21:28 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 27 21:21:28 2014 +0000
tree fa011d1a2df98f7f785e35d177a05b2e285c46b1
parent cb322a116804a690fdde6096d7efef4819151ad9
parent b78e60e7b7de02fed474f170c5c7a8f78f5a0e5c

Merge "Use the default unwind code."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index fb03c39..31807dd 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1089,7 +1089,6 @@
 
 # Make sure that unwind.h comes from libunwind.
 LOCAL_C_INCLUDES := \
-    external/libunwind/include \
     $(libc_common_c_includes) \
 
 LOCAL_SRC_FILES := \
@@ -1105,7 +1104,9 @@
 
 LOCAL_SHARED_LIBRARIES := libc libdl
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
-LOCAL_WHOLE_STATIC_LIBRARIES := libunwindbacktrace
+# 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 := libc++
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
 
 # Don't install on release build