commit 86d879f7fcc1044c18a60bcf8192e18adbde7a5e
author android-build-team Robot <android-build-team-robot@google.com> Wed Apr 07 01:03:57 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 07 01:03:57 2021 +0000
tree 9a4daaa5e2929bd54c4ded783bdafe762e664823
parent de56b8e74a2417603e24ff8d86b876892722f5bb
parent 14f9d046f1684ce5d2654d6226ac7b6bf70567b3

Snap for 7263361 from 14f9d046f1684ce5d2654d6226ac7b6bf70567b3 to sc-v2-release

Change-Id: Ice1317ef6ce65bfaaeb228abab4337b7196d6e0d

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"],