diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-16 20:47:51 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-04 17:19:55 -0800 |
| commit | 27d166cb3aecc003b2ea576ec23695aff78de1a5 (patch) | |
| tree | bf74b1d1b951199d2b6a48411ea477401c047521 /libziparchive | |
| parent | a11ac45536f0722becefccdb6b58378c5d9d0d4b (diff) | |
| download | system_core-27d166cb3aecc003b2ea576ec23695aff78de1a5.zip system_core-27d166cb3aecc003b2ea576ec23695aff78de1a5.tar.gz system_core-27d166cb3aecc003b2ea576ec23695aff78de1a5.tar.bz2 | |
Clean up some test makefiles.
Needed for building with libc++ as the default STL.
Bug: 15193147
Change-Id: I8b462bd288fbea7e0ab182f85ffcbf438afb6aa4
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 76f4e05..2a08b7a 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 @@ -46,11 +42,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 @@ -58,31 +54,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) |