commit 3153886475686963f81a0c40dc4e7f2a902af0c2
author Narayan Kamath <narayan@google.com> Wed Apr 29 16:05:05 2015 +0100
committer Narayan Kamath <narayan@google.com> Wed Apr 29 16:05:46 2015 +0100
tree f927fd962bfb91e0aed9a4e088bec60fd761895c
parent dff7d139f933f415075ecf54be5ae43eb59a4f6a

Use libziparchive shared library on host.

Fixes host run-tests that were broken by de9a75e2ab579804ea44f9688

Change-Id: I0cbd40048f9a222996858f3574d6faa93121a61f

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index cfbaf9b..b21dd2d 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -157,8 +157,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libjavacore
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk
-LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host
-LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libutils libziparchive-host libbase
+LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host libziparchive-host
+LOCAL_STATIC_LIBRARIES += $(core_static_libraries)
 LOCAL_MULTILIB := both
 LOCAL_CXX_STL := libc++
 include $(BUILD_HOST_SHARED_LIBRARY)