ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am a48decd4: Merge "Clean up libzipfile Android.mk"

Browse source 
* commit 'a48decd47b6ef8559418c7d1a68739c5ef50aaf8':
  Clean up libzipfile Android.mk
This commit is contained in:
Elliott Hughes 2014-12-05 19:16:36 +00:00 • committed by Android Git Automerger
commit 34c8d309b0
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libzipfile/Android.mk
View file

@ -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)