libc++abi: use LLVM unwinder on all archsandroid-s-beta-2android-s-beta-1

Set LIBCXXABI_USE_LLVM_UNWINDER=1 now that the LLVM unwinder is used
on all architectures. This macro only actually affects libc++abi on
arm32.

Stop including external/libunwind_llvm/include -- the unwind.h in the
Clang resource directory is sufficient.

Bug: http://b/153025717
Test: treehugger
Change-Id: I067b68f999fb6d50493413365a7b90aabf310b72

1 files changed, 1 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 204876b..c6fcc0e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,21 +118,7 @@ cc_library_static {
         "src/stdlib_stdexcept.cpp",
         "src/stdlib_typeinfo.cpp",
     ],
-    arch: {
-        arm: {
-            include_dirs: ["external/libunwind_llvm/include"],
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=1"],
-        },
-        arm64: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-        x86: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-        x86_64: {
-            cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=0"],
-        },
-    },
+    cppflags: ["-DLIBCXXABI_USE_LLVM_UNWINDER=1"],
     target: {
         android: {
             cppflags: ["-DHAVE___CXA_THREAD_ATEXIT_IMPL"],