arno/simplesshd
1
0
Fork 0
mirror of http://galexander.org/git/simplesshd.git synced 2024-12-29 09:28:07 +00:00
Code Issues Releases Wiki Activity

enable building and using zlib -- quite painless!

Browse Source
This commit is contained in:
Greg Alexander 2014-12-21 15:16:00 -05:00
parent fa0aff7a8d
commit aa9cbca1ed
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jni/Android.mk
View File

@ -468,7 +468,7 @@ DROPBEAR_SRCS := $(DROPBEAR_PATH)/atomicio.c \
LOCAL_SRC_FILES := interface.c $(DROPBEAR_SRCS) LOCAL_SRC_FILES := interface.c $(DROPBEAR_SRCS)
LOCAL_C_INCLUDES:= dropbear dropbear/libtomcrypt/src/headers dropbear/libtommath LOCAL_C_INCLUDES:= dropbear dropbear/libtomcrypt/src/headers dropbear/libtommath
# LOCAL_LDLIBS := LOCAL_LDLIBS := -lz
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@ -488,3 +488,32 @@ LOCAL_C_INCLUDES:= dropbear dropbear/libtomcrypt/src/headers dropbear/libtommath
# LOCAL_LDLIBS := # LOCAL_LDLIBS :=
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
# build separate libz static library
include $(CLEAR_VARS)
LOCAL_CFLAGS :=
LOCAL_MODULE := z
LIBZ_PATH := ../libz
LOCAL_SRC_FILES := $(LIBZ_PATH)/adler32.c \
$(LIBZ_PATH)/crc32.c \
$(LIBZ_PATH)/deflate.c \
$(LIBZ_PATH)/infback.c \
$(LIBZ_PATH)/inffast.c \
$(LIBZ_PATH)/inflate.c \
$(LIBZ_PATH)/inftrees.c \
$(LIBZ_PATH)/trees.c \
$(LIBZ_PATH)/zutil.c \
$(LIBZ_PATH)/compress.c \
$(LIBZ_PATH)/uncompr.c \
$(LIBZ_PATH)/gzclose.c \
$(LIBZ_PATH)/gzlib.c \
$(LIBZ_PATH)/gzread.c \
$(LIBZ_PATH)/gzwrite.c
LOCAL_C_INCLUDES:= libz
# LOCAL_LDLIBS :=
include $(BUILD_STATIC_LIBRARY)

2
jni/config.h
View File

@ -22,7 +22,7 @@
#define HAVE_LIBGEN_H 1 #define HAVE_LIBGEN_H 1
#define USE_DEV_PTMX 1 #define USE_DEV_PTMX 1
#define DISABLE_ZLIB 1 #undef DISABLE_ZLIB
#define DISABLE_SYSLOG 1 #define DISABLE_SYSLOG 1