summaryrefslogtreecommitdiffstats
path: root/NativeCode.mk
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2013-12-11 15:20:44 +0000
committerNarayan Kamath <narayan@google.com>2013-12-11 15:21:00 +0000
commitb168c05d025c2e130e781990ab296f3ae87bd0c1 (patch)
tree3298a056a1287e11b1809700dd58789dbbbbc788 /NativeCode.mk
parentf6899787fcd0a1ca67fb207f39a5c18472e8c892 (diff)
downloadlibcore-b168c05d025c2e130e781990ab296f3ae87bd0c1.zip
libcore-b168c05d025c2e130e781990ab296f3ae87bd0c1.tar.gz
libcore-b168c05d025c2e130e781990ab296f3ae87bd0c1.tar.bz2
Add libutils dependency for libziparchive.
Change-Id: Ie5f4e20eb19a17d37abf8720e4bfeade6c248967
Diffstat (limited to 'NativeCode.mk')
-rw-r--r--NativeCode.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/NativeCode.mk b/NativeCode.mk
index ec9aca5..4d19147 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -82,7 +82,7 @@ LOCAL_CFLAGS += $(core_cflags)
LOCAL_CPPFLAGS += $(core_cppflags)
LOCAL_SRC_FILES += $(core_src_files)
LOCAL_C_INCLUDES += $(core_c_includes)
-LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libexpat libicuuc libicui18n libnativehelper libz
+LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libexpat libicuuc libicui18n libnativehelper libz libutils
LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjavacore
@@ -123,7 +123,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
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) libziparchive-host
+ LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive-host libutils
include $(BUILD_HOST_SHARED_LIBRARY)
ifeq ($(LIBCORE_SKIP_TESTS),)