commit d9d4fe0f3eecdee619433e3ad4ff24bd1f0d0cdc
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 19 04:16:26 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 19 04:16:26 2018 +0000
tree 994b540504cbc19b578c55375b34485e4bd2b458
parent 112e3846757fdd107f63101e6bd7e201ff3c6820
parent 24f8ac037e8f6068787944effa9fe981ea890267

Merge "Rename libunwind static library to libunwind_static"

Android.bp

diff --git a/Android.bp b/Android.bp
index 19f8a11..4191d92 100644
--- a/Android.bp
+++ b/Android.bp
@@ -379,32 +379,32 @@
             ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"],
         },
         android_arm64: {
-            static_libs: ["libunwindbacktrace", "libunwind"],
+            static_libs: ["libunwindbacktrace", "libunwind_static"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
         },
         android_mips: {
-            static_libs: ["libunwindbacktrace", "libunwind"],
+            static_libs: ["libunwindbacktrace", "libunwind_static"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
         },
         android_mips64: {
-            static_libs: ["libunwindbacktrace", "libunwind"],
+            static_libs: ["libunwindbacktrace", "libunwind_static"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
         },
         android_x86: {
-            static_libs: ["libunwindbacktrace", "libunwind"],
+            static_libs: ["libunwindbacktrace", "libunwind_static"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
         },
         android_x86_64: {
             srcs: ["lib/builtins/ppc/floatditf.c"],
-            static_libs: ["libunwindbacktrace", "libunwind"],
+            static_libs: ["libunwindbacktrace", "libunwind_static"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
         },
         linux_glibc: {
-            static_libs: ["libunwindbacktrace", "libunwind"],
+            static_libs: ["libunwindbacktrace", "libunwind_static"],
             shared_libs: ["liblzma"],
         },
         windows: {
-            static_libs: ["libunwindbacktrace", "libunwind"],
+            static_libs: ["libunwindbacktrace", "libunwind_static"],
             // Only build enable_execute_stack.c on non-Windows hosts.
             exclude_srcs: ["lib/builtins/enable_execute_stack.c"],
         },