commit 42a7e19a59075003a98881cd61cd5aa03dfa04a0
author Dan Willemsen <dwillemsen@google.com> Fri Feb 12 23:20:09 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 12 23:20:09 2016 +0000
tree 3e4eee6dbca0f85c911631a06235c0038fb96033
parent 5415c78aa5f6c1e4dcc30d87c1ad4e130b4482e4
parent 5c645249529da08f736cc14d3e50a06ca393bb0f

Merge "Android.bp: workaround static lib ordering"

Android.bp

diff --git a/Android.bp b/Android.bp
index 19c7a9a..4193306 100644
--- a/Android.bp
+++ b/Android.bp
@@ -346,24 +346,29 @@
             ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"],
         },
         android_arm64: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_mips: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_mips64: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_x86: {
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         android_x86_64: {
             srcs: ["lib/builtins/ppc/floatditf.c"],
-            static_libs: ["libunwindbacktrace"],
+            // b/26968262 liblzma needs to be after libunwindbacktrace
+            static_libs: ["libunwindbacktrace","liblzma"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
         linux: {