Merge "Clean up libzipfile Android.mk"

This commit is contained in:
Elliott Hughes 2014-12-05 19:04:47 +00:00 committed by Gerrit Code Review
commit a48decd47b

View file

@ -7,13 +7,10 @@ LOCAL_SRC_FILES:= \
centraldir.c \ centraldir.c \
zipfile.c zipfile.c
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := libz
libunz
LOCAL_MODULE:= libzipfile LOCAL_MODULE:= libzipfile
LOCAL_C_INCLUDES += external/zlib
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
LOCAL_MULTILIB := both LOCAL_MULTILIB := both
@ -27,13 +24,10 @@ LOCAL_SRC_FILES:= \
centraldir.c \ centraldir.c \
zipfile.c zipfile.c
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := libz
libunz
LOCAL_MODULE:= libzipfile LOCAL_MODULE:= libzipfile
LOCAL_C_INCLUDES += external/zlib
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -45,12 +39,10 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
test_zipfile.c test_zipfile.c
LOCAL_STATIC_LIBRARIES := libzipfile libunz LOCAL_STATIC_LIBRARIES := libzipfile libz
LOCAL_MODULE := test_zipfile LOCAL_MODULE := test_zipfile
LOCAL_C_INCLUDES += external/zlib
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)