Use our own zlib for static link and ZLIB_CONST flag

This commit is contained in:
topjohnwu 2017-03-04 21:18:24 +08:00
parent c6d4740b0c
commit 65dc99744e
2 changed files with 4 additions and 4 deletions

View File

@ -2,15 +2,15 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := magiskboot LOCAL_MODULE := magiskboot
LOCAL_STATIC_LIBRARIES := liblzma liblz4 libbz2 LOCAL_STATIC_LIBRARIES := libz liblzma liblz4 libbz2
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
jni/ndk-compression/zlib/ \ jni/ndk-compression/zlib/ \
jni/ndk-compression/xz/src/liblzma/api/ \ jni/ndk-compression/xz/src/liblzma/api/ \
jni/ndk-compression/lz4/lib/ \ jni/ndk-compression/lz4/lib/ \
jni/ndk-compression/bzip2/ jni/ndk-compression/bzip2/
LOCAL_SRC_FILES := main.c unpack.c repack.c hexpatch.c parseimg.c compress.c utils.c cpio.c LOCAL_SRC_FILES := main.c unpack.c repack.c hexpatch.c parseimg.c compress.c utils.c
LOCAL_LDLIBS += -lz LOCAL_CFLAGS += -DZLIB_CONST
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
include jni/ndk-compression/zlib/Android.mk include jni/ndk-compression/zlib/Android.mk

@ -1 +1 @@
Subproject commit ca5279deaa9de6ac695af1c710353d616428e229 Subproject commit b0579533d17f527137633825724231cafb245ebd