Browse Source

Fixed build on Android

merge-experiment
Hoa V. DINH 8 years ago
parent
commit
ab57331e65
5 changed files with 11 additions and 13 deletions
  1. +3
    -3
      build-android/dependencies/cyrus-sasl/build-android/include/config.h
  2. +2
    -4
      build-android/dependencies/cyrus-sasl/build-android/jni/Android.mk
  3. +2
    -2
      build-android/dependencies/cyrus-sasl/build.sh
  4. +3
    -3
      build-android/include/config.h
  5. +1
    -1
      build-android/jni/Android.mk

+ 3
- 3
build-android/dependencies/cyrus-sasl/build-android/include/config.h View File

@ -221,7 +221,7 @@
#define HAVE_SNPRINTF /**/
/* Does sockaddr have an sa_len? */
//#define HAVE_SOCKADDR_SA_LEN /**/
/* #undef HAVE_SOCKADDR_SA_LEN */
/* Define to 1 if you have the `socket' function. */
#define HAVE_SOCKET 1
@ -394,7 +394,7 @@
#define STATIC_DIGESTMD5 /**/
/* Link GSSAPI Staticly */
#define STATIC_GSSAPIV2 /**/
/* #undef STATIC_GSSAPIV2 */
/* User KERBEROS_V4 Staticly */
/* #undef STATIC_KERBEROS4 */
@ -418,7 +418,7 @@
#define STATIC_PLAIN /**/
/* Link SASLdb Staticly */
#define STATIC_SASLDB /**/
/* #undef STATIC_SASLDB */
/* Link SCRAM Staticly */
#define STATIC_SCRAM /**/


+ 2
- 4
build-android/dependencies/cyrus-sasl/build-android/jni/Android.mk View File

@ -8,11 +8,13 @@ lib/checkpw.c \
lib/client.c \
lib/common.c \
lib/config.c \
lib/dlopen.c \
lib/external.c \
lib/getsubopt.c \
lib/md5.c \
lib/saslutil.c \
lib/server.c \
lib/seterror.c \
lib/snprintf.c \
plugins/anonymous.c \
plugins/anonymous_init.c \
@ -31,12 +33,8 @@ plugins/passdss_init.c \
plugins/plain.c \
plugins/plain_init.c \
plugins/plugin_common.c \
plugins/sasldb.c \
plugins/sasldb_init.c \
plugins/scram.c \
plugins/scram_init.c \
plugins/sql.c \
plugins/sql_init.c \
plugins/srp.c \
plugins/srp_init.c


+ 2
- 2
build-android/dependencies/cyrus-sasl/build.sh View File

@ -23,7 +23,7 @@ if [ ! -e "$package_dir/$ARCHIVE_NAME" ]; then
exit 1
fi
if test ! -f "$current_dir/../openssl/openssl-$openssl_build_version.zip" ; then
if test ! -f "$current_dir/../openssl/openssl-android-$openssl_build_version.zip" ; then
echo Building OpenSSL first
cd "$current_dir/../openssl"
./build.sh
@ -49,7 +49,7 @@ function build {
fi
cd "$current_dir/src"
unzip -q "$current_dir/../openssl/openssl-$openssl_build_version.zip"
unzip -q "$current_dir/../openssl/openssl-android-$openssl_build_version.zip"
cp -R "$current_dir/build-android" "$current_dir/src/$ARCHIVE"
cd "$current_dir/src/$ARCHIVE/build-android/jni"


+ 3
- 3
build-android/include/config.h View File

@ -8,7 +8,7 @@
#endif
/* Define to detected Berkeley DB major version number */
#define DBVERS 1
/* #undef DBVERS */
/* Define to 1 if you have the <arpa/inet.h> header file. */
#define HAVE_ARPA_INET_H 1
@ -35,7 +35,7 @@
#define HAVE_GETPAGESIZE 1
/* Define if you have the iconv() function. */
#define HAVE_ICONV 1
/* #undef HAVE_ICONV */
/* prototype of iconv() has const parameters */
/* #undef HAVE_ICONV_PROTO_CONST */
@ -68,7 +68,7 @@
#define HAVE_MMAP 1
/* Define to 1 if you have the <netdb.h> header file. */
#define HAVE_NETDB_H 1
/* #undef HAVE_NETDB_H */
/* Define to 1 if you have the <netinet/in.h> header file. */
#define HAVE_NETINET_IN_H 1


+ 1
- 1
build-android/jni/Android.mk View File

@ -123,7 +123,7 @@ src_files = \
NDK_TOOLCHAIN_VERSION := clang
LOCAL_MODULE := etpan
LOCAL_SRC_FILES := $(addprefix ../../, $(src_files))
LOCAL_CFLAGS += -DHAVE_SYS_MMAN_H=1 -DUSE_SSL=1
LOCAL_CFLAGS += -DHAVE_CONFIG_H=1
c_includes = \
src \
src/data-types \


Loading…
Cancel
Save