diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-30 18:08:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-30 18:08:17 +0000 |
| commit | 8dac3559dd61bb428db401dc7a7e69bd85943394 (patch) | |
| tree | 74a3d1bce47cf4c127220e4ac44e60798014bd2c | |
| parent | ffb60ce6b343535c46f45eb5a4d83d69e170e316 (diff) | |
| parent | b968d5c8468c9b0707f88f773fae16074e9018cf (diff) | |
| download | system_core-8dac3559dd61bb428db401dc7a7e69bd85943394.zip system_core-8dac3559dd61bb428db401dc7a7e69bd85943394.tar.gz system_core-8dac3559dd61bb428db401dc7a7e69bd85943394.tar.bz2 | |
am b968d5c8: Merge "Add shared library version of libziparchive."
* commit 'b968d5c8468c9b0707f88f773fae16074e9018cf':
Add shared library version of libziparchive.
| -rw-r--r-- | libziparchive/Android.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 0333750..51ae0d9 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -49,6 +49,19 @@ LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_MODULE := libziparchive +LOCAL_CPP_EXTENSION := .cc +LOCAL_SRC_FILES := ${source_files} +LOCAL_C_INCLUDES += ${includes} + +LOCAL_STATIC_LIBRARIES := libz libutils +LOCAL_SHARED_LIBRARIES := liblog +LOCAL_MODULE:= libziparchive-host +LOCAL_CFLAGS := -Werror +LOCAL_MULTILIB := both +include $(BUILD_HOST_SHARED_LIBRARY) + +include $(CLEAR_VARS) LOCAL_MODULE := ziparchive-tests LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS += \ @@ -69,10 +82,10 @@ LOCAL_CFLAGS += \ -Werror \ -Wno-unnamed-type-template-args LOCAL_SRC_FILES := zip_archive_test.cc -LOCAL_STATIC_LIBRARIES := libziparchive-host \ +LOCAL_SHARED_LIBRARIES := libziparchive-host liblog +LOCAL_STATIC_LIBRARIES := \ libz \ libgtest_host \ libgtest_main_host \ - liblog \ libutils include $(BUILD_HOST_NATIVE_TEST) |