commit 371496daf03921c0c3ade8bc20b33b6454d8d495
author Evgenii Stepanov <eugenis@google.com> Tue Jun 30 22:19:13 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 30 22:19:17 2015 +0000
tree ccedbe42b3d721e74d72babe01bb4ffe8784f27c
parent 053df00e1d27e658f016f4ff6d5a822861555e6a
parent 0b3ac8e60fe44d56054eb37e2441b730f165d605

Merge "Explicitly link libz-host to libart."

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 5ed6955..19079cb 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -478,7 +478,7 @@
     # For liblog, atrace, properties, ashmem, set_sched_policy and socket_peer_is_trusted.
     LOCAL_SHARED_LIBRARIES += libcutils
   else # host
-    LOCAL_SHARED_LIBRARIES += libziparchive-host
+    LOCAL_SHARED_LIBRARIES += libziparchive-host libz-host
     # For ashmem_create_region.
     LOCAL_SHARED_LIBRARIES += libcutils
   endif