Merge "Add shared library version of libziparchive." (b968d5c8) · Commits · e / os / android_system_core

libziparchive/Android.mk

+15 −2

Original line number	Diff line number	Diff line
		@@ -45,6 +45,19 @@ LOCAL_CFLAGS := -Werror
		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
		@@ -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)