diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-05 02:27:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-05 02:27:42 +0000 |
| commit | 5fc8f683e6345353d418cb32f4f8335964e1613b (patch) | |
| tree | e1198dbaf57ff0d60a260a92aa42bb8df8df7dfe /libziparchive | |
| parent | d4c7a1cfad22a55d31b6a27b859fb534194fb0e4 (diff) | |
| parent | 7a92d20ec845c07472eaea7cf14fd0e69df836ef (diff) | |
| download | system_core-5fc8f683e6345353d418cb32f4f8335964e1613b.zip system_core-5fc8f683e6345353d418cb32f4f8335964e1613b.tar.gz system_core-5fc8f683e6345353d418cb32f4f8335964e1613b.tar.bz2 | |
am 7a92d20e: Merge "Clean up some test makefiles."
* commit '7a92d20ec845c07472eaea7cf14fd0e69df836ef':
Clean up some test makefiles.
Diffstat (limited to 'libziparchive')
| -rw-r--r-- | libziparchive/Android.mk | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 51ae0d9..9bc6e61 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -14,31 +14,27 @@ # limitations under the License. LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -source_files := \ - zip_archive.h \ - zip_archive.cc +source_files := zip_archive.cc includes := external/zlib +include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := ${source_files} - LOCAL_STATIC_LIBRARIES := libz LOCAL_SHARED_LIBRARIES := libutils LOCAL_MODULE:= libziparchive - LOCAL_C_INCLUDES += ${includes} LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := libziparchive LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := ${source_files} LOCAL_C_INCLUDES += ${includes} - LOCAL_STATIC_LIBRARIES := libz libutils LOCAL_MODULE:= libziparchive-host LOCAL_CFLAGS := -Werror @@ -49,11 +45,11 @@ LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 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 @@ -61,31 +57,27 @@ LOCAL_CFLAGS := -Werror LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) +# Tests. include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := ziparchive-tests LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS += \ - -DGTEST_OS_LINUX_ANDROID \ - -DGTEST_HAS_STD_STRING \ - -Werror +LOCAL_CFLAGS := -Werror LOCAL_SRC_FILES := zip_archive_test.cc LOCAL_SHARED_LIBRARIES := liblog -LOCAL_STATIC_LIBRARIES := libziparchive libz libgtest libgtest_main libutils +LOCAL_STATIC_LIBRARIES := libziparchive libz libutils include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := ziparchive-tests-host LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS += \ - -DGTEST_OS_LINUX \ - -DGTEST_HAS_STD_STRING \ -Werror \ -Wno-unnamed-type-template-args LOCAL_SRC_FILES := zip_archive_test.cc LOCAL_SHARED_LIBRARIES := libziparchive-host liblog LOCAL_STATIC_LIBRARIES := \ - libz \ - libgtest_host \ - libgtest_main_host \ - libutils + libz \ + libutils include $(BUILD_HOST_NATIVE_TEST) |