d8fc39a2ca
Switch to using libz instead of libunz as per the note in external/zlib/Android.mk. Removed LOCAL_C_INCLUDES which are no longer necessary as zlib now uses the LOCAL_EXPORT_C_INCLUDE_DIRS mechanism. Tested compiling the projects that make use of libzipfile using a clean out dir with both aosp_flounder-userdebug and aosp_arm-eng make -j16 test_zipfile fastboot adb adbd libSR_Core libsrec_jni Change-Id: I5fdf34b6c272ae64c406e5b77ab67a5f5e4b5890
48 lines
705 B
Makefile
48 lines
705 B
Makefile
LOCAL_PATH:= $(call my-dir)
|
|
|
|
# build host static library
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES:= \
|
|
centraldir.c \
|
|
zipfile.c
|
|
|
|
LOCAL_STATIC_LIBRARIES := libz
|
|
|
|
LOCAL_MODULE:= libzipfile
|
|
|
|
LOCAL_CFLAGS := -Werror
|
|
|
|
LOCAL_MULTILIB := both
|
|
|
|
include $(BUILD_HOST_STATIC_LIBRARY)
|
|
|
|
# build device static library
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES:= \
|
|
centraldir.c \
|
|
zipfile.c
|
|
|
|
LOCAL_STATIC_LIBRARIES := libz
|
|
|
|
LOCAL_MODULE:= libzipfile
|
|
|
|
LOCAL_CFLAGS := -Werror
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
# build test_zipfile
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES:= \
|
|
test_zipfile.c
|
|
|
|
LOCAL_STATIC_LIBRARIES := libzipfile libz
|
|
|
|
LOCAL_MODULE := test_zipfile
|
|
|
|
LOCAL_CFLAGS := -Werror
|
|
|
|
include $(BUILD_HOST_EXECUTABLE)
|