commit 40855538527351c24a272252efa52a2e4ff2d27b
author Christopher Ferris <cferris@google.com> Tue Dec 05 16:31:35 2023 -0800
committer Christopher Ferris <cferris@google.com> Wed Jan 10 18:46:20 2024 +0000
tree 232f5cf7abbf98ea4bdd75390dd99f76d4298558
parent 3c3a498be24cd5acec1f800cb6a8aa15b5282589

Update for libunwindstack adding libz.

The static version of libunwindstack includes libz, so remove libz
from the list of static libraries when it is included.

Bug: 309857311

Test: Builds.
Change-Id: Ib9a2997a878ea99992efb84290b756afc2fe1f0a

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index fcac3b4..631b0df 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -624,6 +624,9 @@
         "libnativebridge",
         "libodrstatslog",
         "libunwindstack",
+    ],
+    exclude_static_libs: [
+        // This library comes from the static version of libunwindstack.
         "libz",
     ],
     target: {