ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add shared library version of libziparchive."

Browse source
This commit is contained in:
Ian Rogers 2014-10-30 18:05:55 +00:00 • committed by Gerrit Code Review
commit b968d5c846
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libziparchive/Android.mk
View file

@ -45,6 +45,19 @@ LOCAL_CFLAGS := -Werror
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY) 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) include $(CLEAR_VARS)
LOCAL_MODULE := ziparchive-tests LOCAL_MODULE := ziparchive-tests
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
@ -66,10 +79,10 @@ LOCAL_CFLAGS += \
-Werror \ -Werror \
-Wno-unnamed-type-template-args -Wno-unnamed-type-template-args
LOCAL_SRC_FILES := zip_archive_test.cc LOCAL_SRC_FILES := zip_archive_test.cc
LOCAL_STATIC_LIBRARIES := libziparchive-host \ LOCAL_SHARED_LIBRARIES := libziparchive-host liblog
LOCAL_STATIC_LIBRARIES := \
libz \ libz \
libgtest_host \ libgtest_host \
libgtest_main_host \ libgtest_main_host \
liblog \
libutils libutils
include $(BUILD_HOST_NATIVE_TEST) include $(BUILD_HOST_NATIVE_TEST)