summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-14 23:56:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-14 23:56:10 +0000
commitf765f77f7453ff2d264fb9bed86dde0374c1b587 (patch)
tree12ddcf774fafcd986db7dde58e560b787d721a19
parent0416f86023f8086b551209a8454420d13f70570e (diff)
parent5d7b6dffa41dffb6e80e91041bbd4e8fd759c4a1 (diff)
downloadexternal_libcxx-f765f77f7453ff2d264fb9bed86dde0374c1b587.tar.gz
external_libcxx-f765f77f7453ff2d264fb9bed86dde0374c1b587.tar.bz2
external_libcxx-f765f77f7453ff2d264fb9bed86dde0374c1b587.zip
am 5d7b6dff: am a3287786: Use libgcc unwinder for non-ARM targets.
* commit '5d7b6dffa41dffb6e80e91041bbd4e8fd759c4a1': Use libgcc unwinder for non-ARM targets.
-rw-r--r--Android.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index ad1f871b5..e3f25ffb1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,11 +73,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libc++_static
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_CXX_STL := none
LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
-LOCAL_STATIC_LIBRARIES_arm64 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_mips := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_mips64 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_x86 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_x86_64 := libunwindbacktrace
include $(BUILD_SHARED_LIBRARY)
# host static lib