commit 14e0b71fffd0243a2bfc7e10e43b88d19e33f2e8
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 15 18:29:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 15 18:29:10 2021 +0000
tree 0571fedc9bc2b9fdee6feba9a368eb330242fac8
parent 65c164706bc4cc5deb780f83cccfd12228b50393
parent 0f2c740a7cf36d8dd345b8d91ebe609ce040f87f

Merge "Switch RenderScript's compiler-rt to existing unwinders."

Android.bp

diff --git a/Android.bp b/Android.bp
index 31ef872..c9a2483 100644
--- a/Android.bp
+++ b/Android.bp
@@ -370,20 +370,17 @@
             ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"],
         },
         android_arm64: {
-            static_libs: ["libunwindbacktrace", "libunwind_static"],
-            ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
+            static_libs: ["libgcc_stripped"],
+            ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
         },
         android_x86: {
-            static_libs: ["libunwindbacktrace", "libunwind_static"],
-            ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
+            static_libs: ["libgcc_stripped"],
+            ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
         },
         android_x86_64: {
             srcs: ["lib/builtins/ppc/floatditf.c"],
-            static_libs: ["libunwindbacktrace", "libunwind_static"],
-            ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
-        },
-        linux_glibc: {
-            static_libs: ["libunwindbacktrace", "libunwind_static"],
+            static_libs: ["libgcc_stripped"],
+            ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
         },
         windows: {
             enabled: true,