diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-29 16:05:05 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-04-29 16:05:46 +0100 |
| commit | 3153886475686963f81a0c40dc4e7f2a902af0c2 (patch) | |
| tree | f927fd962bfb91e0aed9a4e088bec60fd761895c /NativeCode.mk | |
| parent | dff7d139f933f415075ecf54be5ae43eb59a4f6a (diff) | |
| download | libcore-3153886475686963f81a0c40dc4e7f2a902af0c2.zip libcore-3153886475686963f81a0c40dc4e7f2a902af0c2.tar.gz libcore-3153886475686963f81a0c40dc4e7f2a902af0c2.tar.bz2 | |
Use libziparchive shared library on host.
Fixes host run-tests that were broken by de9a75e2ab579804ea44f9688
Change-Id: I0cbd40048f9a222996858f3574d6faa93121a61f
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index cfbaf9b..b21dd2d 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -157,8 +157,8 @@ endif 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) |