commit 14f9d046f1684ce5d2654d6226ac7b6bf70567b3
author Ryan Prichard <rprichard@google.com> Mon Apr 05 23:24:01 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 05 23:24:01 2021 +0000
tree 9a4daaa5e2929bd54c4ded783bdafe762e664823
parent 0c68752f0bdad870ef73b6fc172b0057c57d4832
parent 6cdf71d88030e2bd067aa61cb5b520e0ad877389

libc++abi: use LLVM unwinder on all archs am: 64b9839122 am: a07a6e34d0 am: 6cdf71d880

Original change: https://android-review.googlesource.com/c/platform/external/libcxxabi/+/1662264

Change-Id: I75b074a81467d10def21a6831e6c5b326ee7b2cc

Android.bp

diff --git a/Android.bp b/Android.bp
index 204876b..c6fcc0e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,21 +118,7 @@
         "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"],