Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a48decd4 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Clean up libzipfile Android.mk"

parents e19e3fc7 d8fc39a2

libzipfile/Android.mk

+3 −11
Original line number Diff line number Diff line
@@ -7,13 +7,10 @@ LOCAL_SRC_FILES:= \ 
	centraldir.c \

	zipfile.c



LOCAL_STATIC_LIBRARIES := \

	libunz

LOCAL_STATIC_LIBRARIES := libz



LOCAL_MODULE:= libzipfile



LOCAL_C_INCLUDES += external/zlib



LOCAL_CFLAGS := -Werror



LOCAL_MULTILIB := both
@@ -27,13 +24,10 @@ LOCAL_SRC_FILES:= \ 
	centraldir.c \

	zipfile.c



LOCAL_STATIC_LIBRARIES := \

	libunz

LOCAL_STATIC_LIBRARIES := libz



LOCAL_MODULE:= libzipfile



LOCAL_C_INCLUDES += external/zlib



LOCAL_CFLAGS := -Werror



include $(BUILD_STATIC_LIBRARY)
@@ -45,12 +39,10 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES:= \

	test_zipfile.c



LOCAL_STATIC_LIBRARIES := libzipfile libunz

LOCAL_STATIC_LIBRARIES := libzipfile libz



LOCAL_MODULE := test_zipfile



LOCAL_C_INCLUDES += external/zlib



LOCAL_CFLAGS := -Werror



include $(BUILD_HOST_EXECUTABLE)