commit fba53b14ff4b688d61065fc40eb030f9340657fb
author android-build-team Robot <android-build-team-robot@google.com> Sun Dec 23 04:04:37 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Dec 23 04:04:37 2018 +0000
tree 994b540504cbc19b578c55375b34485e4bd2b458
parent 413404611a4887a4a3b850cdb5c1d9c231b1ea43
parent 6157c6b6dc3ad987043e5134ee4a61a6ef79bea1

Snap for 5198681 from 6157c6b6dc3ad987043e5134ee4a61a6ef79bea1 to qt-release

Change-Id: Ie82ed9aa655742ccd1dc8870d1a77b356ece78b6

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