Merge pull request #81 from tux-mind/patch-1

Fix missing openssl library on android 6.0
This commit is contained in:
van Hauser 2015-11-27 08:24:01 +01:00
commit 2561a0aece

View file

@ -2,8 +2,8 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CFLAGS:= -O3 -DLIBOPENSSL -DLIBFIREBIRD -DLIBIDN -DHAVE_PR29_H -DHAVE_PCRE \ LOCAL_CFLAGS:= -O3 -DLIBOPENSSL -DLIBFIREBIRD -DLIBIDN -DHAVE_PR29_H -DHAVE_PCRE \
-DLIBMYSQLCLIENT -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH -DNO_RINDEX \ -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH -DNO_RINDEX \
-DHAVE_MATH_H -DHAVE_MYSQL_H -DOPENSSL_NO_DEPRECATED -DNO_RSA_LEGACY \ -DHAVE_MATH_H -DOPENSSL_NO_DEPRECATED -DNO_RSA_LEGACY \
-fdata-sections -ffunction-sections -fdata-sections -ffunction-sections
LOCAL_LDFLAGS:=-Wl,--gc-sections LOCAL_LDFLAGS:=-Wl,--gc-sections
@ -13,7 +13,6 @@ LOCAL_C_INCLUDES:= \
external/openssl/include\ external/openssl/include\
external/libssh/include\ external/libssh/include\
external/libidn/lib\ external/libidn/lib\
external/libmysqlclient/include\
external/subversion/subversion/include\ external/subversion/subversion/include\
external/apr/include\ external/apr/include\
external/firebird/include\ external/firebird/include\
@ -58,6 +57,7 @@ LOCAL_SRC_FILES:= \
hydra-rexec.c\ hydra-rexec.c\
hydra-rlogin.c\ hydra-rlogin.c\
hydra-rsh.c\ hydra-rsh.c\
hydra-rtsp.c\
hydra-s7-300.c\ hydra-s7-300.c\
hydra-sapr3.c\ hydra-sapr3.c\
hydra-sip.c\ hydra-sip.c\
@ -80,7 +80,6 @@ LOCAL_SRC_FILES:= \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libfbclient \ libfbclient \
libidn \ libidn \
libmysqlclient \
libncp \ libncp \
libpcre \ libpcre \
libpcrecpp \ libpcrecpp \
@ -91,11 +90,11 @@ LOCAL_STATIC_LIBRARIES := \
libapr-1 \ libapr-1 \
libaprutil-1 \ libaprutil-1 \
libiconv\ libiconv\
libneon libneon\
libcrypto_static\
libssl
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcrypto\
libssl\
libsqlite\ libsqlite\
libexpat libexpat