commit 54a6221cc21c9fa2be0e5ca77ea7cd76fabfd096
author The Android Automerger <android-build@google.com> Wed Aug 27 06:09:31 2014 -0700
committer The Android Automerger <android-build@google.com> Wed Aug 27 06:09:31 2014 -0700
tree c20d52721735a6997c8e8ea1dcf5280598ee2d1e
parent 3f7635f4906c53fa744731efc35235456b7d93bf
parent 489b5d23fd73b0bcf32df5d4d3a3ddd5f4c4a3eb

merge in lmp-release history after reset to 3f7635f4906c53fa744731efc35235456b7d93bf

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 32c9fa6..5098171 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1070,7 +1070,6 @@
 
 # Make sure that unwind.h comes from libunwind.
 LOCAL_C_INCLUDES := \
-    external/libunwind/include \
     $(libc_common_c_includes) \
 
 LOCAL_SRC_FILES := \
@@ -1086,7 +1085,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