diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-30 09:53:38 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-30 09:53:38 -0700 |
| commit | 40ac96c72c7c0f9175c2acf5faea883cef647294 (patch) | |
| tree | b240a85b24d1127e9bd3bdb29a5875de4cf84303 /libziparchive | |
| parent | 91b76d7de3029f6e617d640ca1b9ef844fa44477 (diff) | |
| download | system_core-40ac96c72c7c0f9175c2acf5faea883cef647294.zip system_core-40ac96c72c7c0f9175c2acf5faea883cef647294.tar.gz system_core-40ac96c72c7c0f9175c2acf5faea883cef647294.tar.bz2 | |
Add shared library version of libziparchive.
Change-Id: I9abded3bbff0e7976b1849c73e6978dd10ca84cd
Diffstat (limited to '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 d96bc63..76f4e05 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -46,6 +46,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 += \ @@ -66,10 +79,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) |