diff --git a/android/build.gradle b/android/build.gradle index a5c7524b0..ee3efdde2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -104,7 +104,7 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) { into "$thirdPartyNdkDir/folly" } -task downloadLibEvent(dependsOn: [prepareFolly], type: Download) { +task downloadLibEvent(dependsOn: [], type: Download) { src 'https://github.com/libevent/libevent/archive/release-2.1.8-stable.tar.gz' onlyIfNewer true overwrite false @@ -119,13 +119,34 @@ task prepareLibEvent(dependsOn: [downloadLibEvent], type: Copy) { into "$thirdPartyNdkDir/LibEvent" } +task finalizeEvent(dependsOn: [prepareLibEvent], type: Copy) { + from './third-party/LibEvent/' + include 'event-config.h' + includeEmptyDirs = false + into "$thirdPartyNdkDir/LibEvent/libevent-release-2.1.8-stable/include/event2/" +} +task downloadOpenSSL(dependsOn: [], type: Download) { + src 'https://github.com/priteshrnandgaonkar/openssl-android/archive/1.0.0.tar.gz' + onlyIfNewer true + overwrite false + dest new File(downloadsDir, 'openssl-android-1.0.0.tar.gz'); +} + +task prepareOpenSSL(dependsOn: [downloadOpenSSL], type: Copy) { + from tarTree(downloadOpenSSL.dest) + from './third-party/OpenSSL/' + include 'openssl-android-1.0.0/**/*', 'build.gradle', 'ApplicationManifest.xml' + includeEmptyDirs = false + into "$thirdPartyNdkDir/OpenSSL/" +} + task prepareAllLibs() { dependsOn finalizeGlog dependsOn prepareDoubleConversion dependsOn prepareBoost dependsOn prepareFolly - dependsOn downloadLibEvent - dependsOn prepareLibEvent + dependsOn finalizeEvent + dependsOn prepareOpenSSL } android { diff --git a/android/third-party/Folly/CMakeLists.txt b/android/third-party/Folly/CMakeLists.txt index 716feb27e..4bce1b2d7 100644 --- a/android/third-party/Folly/CMakeLists.txt +++ b/android/third-party/Folly/CMakeLists.txt @@ -15,16 +15,23 @@ list(APPEND dir_list ${FOLLY_DIR}/memory/detail) set(BOOST_DIR ../boost/boost_1_63_0/) set(GLOG_DIR ../glog/) -set(LIBEVENT_DIR ../LibEvent/libevent-1.0.0/include) +set(OPENSSL_DIR ../OpenSSL/openssl-android-1.0.0/jni/openssl-android/) + +set(LIBEVENT_DIR ../LibEvent/libevent-release-2.1.8-stable/) set(DOUBLECONVERSION_DIR ../double-conversion/double-conversion-3.0.0/) list(APPEND dir_list ${BOOST_DIR}) list(APPEND dir_list ${BOOST_DIR}/../) list(APPEND dir_list ${LIBEVENT_DIR}/) +list(APPEND dir_list ${LIBEVENT_DIR}/include/) +list(APPEND dir_list ${OPENSSL_DIR}) +list(APPEND dir_list ${OPENSSL_DIR}/include) +list(APPEND dir_list ${OPENSSL_DIR}/include/openssl) include_directories(${dir_list}) - +# -DFOLLY_FORCE_CLOCK_GETTIME_DEFINITION=1 add_compile_options( + -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_PTHREAD=1 -DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_MEMRCHR @@ -44,8 +51,8 @@ add_compile_options( -Wno-tautological-constant-compare ) -file(GLOB SRC_FILES ${FOLLY_DIR}/*.cpp - ${FOLLY_DIR}/detail/*.cpp +# ${FOLLY_DIR}/*.cpp +file(GLOB SRC_FILES ${FOLLY_DIR}/detail/*.cpp ${FOLLY_DIR}/hash/*.cpp ${FOLLY_DIR}/portability/*.cpp ${FOLLY_DIR}/io/async/*.cpp @@ -88,13 +95,18 @@ set(build_DIR ${CMAKE_SOURCE_DIR}/build) set(libglog_build_DIR ${build_DIR}/libglog/${ANDROID_ABI}) set(doubleconversion_build_DIR ${build_DIR}/doubleconversion/${ANDROID_ABI}) + file(MAKE_DIRECTORY ${build_DIR}) add_subdirectory(${GLOG_DIR} ${libglog_build_DIR}) add_subdirectory(${DOUBLECONVERSION_DIR} ${doubleconversion_build_DIR}) target_include_directories(${PACKAGE_NAME} PRIVATE + ${OPENSSL_DIR} + ${OPENSSL_DIR}/include + ${OPENSSL_DIR}/include/openssl ${LIBEVENT_DIR} + ${LIBEVENT_DIR}/include/ ${LIBEVENT_DIR}/../ ${BOOST_DIR} ${BOOST_DIR}/../ @@ -104,4 +116,4 @@ target_include_directories(${PACKAGE_NAME} PRIVATE install(TARGETS ${PACKAGE_NAME} DESTINATION ./build/) -target_link_libraries(${PACKAGE_NAME} glog double-conversion) +target_link_libraries(${PACKAGE_NAME} glog double-conversion ssl crypto) diff --git a/android/third-party/LibEvent/event-config.h b/android/third-party/LibEvent/event-config.h new file mode 100644 index 000000000..470a41728 --- /dev/null +++ b/android/third-party/LibEvent/event-config.h @@ -0,0 +1,365 @@ +/* event2/event-config.h + * + * This file was generated by autoconf when libevent was built, and post- + * processed by Libevent so that its macros would have a uniform prefix. + * + * DO NOT EDIT THIS FILE. + * + * Do not rely on macros in this file existing in later versions. + */ +#ifndef EVENT_CONFIG_H__ +#define EVENT_CONFIG_H__ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if libevent should not allow replacing the mm functions */ +/* #undef EVENT__DISABLE_MM_REPLACEMENT */ + +/* Define if libevent should not be compiled with thread support */ +/* #undef EVENT__DISABLE_THREAD_SUPPORT */ + +/* Define if clock_gettime is available in libc */ +/* #undef _EVENT_DNS_USE_CPU_CLOCK_FOR_ID */ + +/* Define is no secure id variant is available */ +/* #define _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID 1 */ +#define EVENT_DNS_USE_FTIME_FOR_ID_ 1 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_ARPA_INET_H */ + +/* Define to 1 if you have the `clock_gettime' function. */ +/* #undef EVENT__HAVE_CLOCK_GETTIME */ + +/* Define if /dev/poll is available */ +/* #undef EVENT__HAVE_DEVPOLL */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_DLFCN_H */ + +/* Define if your system supports the epoll system calls */ +/* #undef EVENT__HAVE_EPOLL */ + +/* Define to 1 if you have the `epoll_ctl' function. */ +/* #undef EVENT__HAVE_EPOLL_CTL */ + +/* Define to 1 if you have the `eventfd' function. */ +/* #undef EVENT__HAVE_EVENTFD */ + +/* Define if your system supports event ports */ +/* #undef EVENT__HAVE_EVENT_PORTS */ + +/* Define to 1 if you have the `fcntl' function. */ +/* #undef EVENT__HAVE_FCNTL */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ +#define EVENT__HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getnameinfo' function. */ +#define EVENT__HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the `getprotobynumber' function. */ +#define EVENT__HAVE_GETPROTOBYNUMBER 1 + +/* Define to 1 if you have the `getservbyname' function. */ +#define EVENT__HAVE_GETSERVBYNAME 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +/* #define EVENT__HAVE_GETTIMEOFDAY 1 */ + +/* Define to 1 if you have the `inet_ntop' function. */ +/* #undef EVENT__HAVE_INET_NTOP */ + +/* Define to 1 if you have the `inet_pton' function. */ +/* #undef EVENT__HAVE_INET_PTON */ + +/* Define to 1 if you have the header file. */ +/* #define EVENT__HAVE_INTTYPES_H 1 */ + +/* Define to 1 if you have the `kqueue' function. */ +/* #undef EVENT__HAVE_KQUEUE */ + +/* Define if the system has zlib */ +/* #undef EVENT__HAVE_LIBZ */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mmap' function. */ +/* #undef EVENT__HAVE_MMAP */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_NETINET_IN6_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_NETINET_IN_H */ + +/* Define to 1 if you have the `pipe' function. */ +/* #undef EVENT__HAVE_PIPE */ + +/* Define to 1 if you have the `poll' function. */ +/* #undef EVENT__HAVE_POLL */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_POLL_H */ + +/* Define to 1 if you have the `port_create' function. */ +/* #undef EVENT__HAVE_PORT_CREATE */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_PORT_H */ + +/* Define if you have POSIX threads libraries and header files. */ +/* #undef EVENT__HAVE_PTHREAD */ + +/* Define if we have pthreads on this system */ +/* #undef EVENT__HAVE_PTHREADS */ + +/* Define to 1 if the system has the type `sa_family_t'. */ +/* #undef EVENT__HAVE_SA_FAMILY_T */ + +/* Define to 1 if you have the `select' function. */ +/* #undef EVENT__HAVE_SELECT */ + +/* Define to 1 if you have the `sendfile' function. */ +/* #undef EVENT__HAVE_SENDFILE */ + +/* Define if F_SETFD is defined in */ +/* #undef EVENT__HAVE_SETFD */ + +/* Define to 1 if you have the `sigaction' function. */ +/* #undef EVENT__HAVE_SIGACTION */ + +/* Define to 1 if you have the `signal' function. */ +#define EVENT__HAVE_SIGNAL 1 + +/* Define to 1 if you have the `splice' function. */ +/* #undef EVENT__HAVE_SPLICE */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +/* #define EVENT__HAVE_STDINT_H 1 */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +/* #undef EVENT__HAVE_STRLCPY */ + +/* Define to 1 if you have the `strsep' function. */ +/* #undef EVENT__HAVE_STRSEP */ + +/* Define to 1 if you have the `strtok_r' function. */ +/* #undef EVENT__HAVE_STRTOK_R */ + +/* Define to 1 if you have the `strtoll' function. */ +/* #define EVENT__HAVE_STRTOLL 1 */ + +#define EVENT__HAVE_STRUCT_ADDRINFO 1 + +/* Define to 1 if the system has the type `struct in6_addr'. */ +#define EVENT__HAVE_STRUCT_IN6_ADDR 1 + +/* Define to 1 if `s6_addr16' is member of `struct in6_addr'. */ +#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR16 1 + +/* Define to 1 if `s6_addr32' is member of `struct in6_addr'. */ +#define EVENT__HAVE_STRUCT_IN6_ADDR_S6_ADDR32 1 + +/* Define to 1 if the system has the type `struct sockaddr_in6'. */ +#define EVENT__HAVE_STRUCT_SOCKADDR_IN6 1 + +/* Define to 1 if `sin6_len' is member of `struct sockaddr_in6'. */ +/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN */ + +/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */ +/* #undef EVENT__HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */ + +/* Define to 1 if the system has the type `struct sockaddr_storage'. */ +#define EVENT__HAVE_STRUCT_SOCKADDR_STORAGE 1 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_DEVPOLL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_EPOLL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_EVENTFD_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_EVENT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_IOCTL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_MMAN_H */ + +/* Define to 1 if you have the header file. */ +/* #define EVENT__HAVE_SYS_PARAM_H 1 */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_QUEUE_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_SELECT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_SENDFILE_H */ + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_SOCKET_H */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #define EVENT__HAVE_SYS_TIME_H 1 */ + +/* Define to 1 if you have the header file. */ +#define EVENT__HAVE_SYS_TYPES_H 0 + +/* Define to 1 if you have the header file. */ +/* #undef EVENT__HAVE_SYS_UIO_H */ + +/* Define if TAILQ_FOREACH is defined in */ +/* #undef EVENT__HAVE_TAILQFOREACH */ + +/* Define if timeradd is defined in */ +/* #undef EVENT__HAVE_TIMERADD */ + +/* Define if timerclear is defined in */ +#define EVENT__HAVE_TIMERCLEAR 1 + +/* Define if timercmp is defined in */ +#define EVENT__HAVE_TIMERCMP 1 + +/* Define if timerisset is defined in */ +#define EVENT__HAVE_TIMERISSET 1 + +/* Define to 1 if the system has the type `uint16_t'. */ +/* #define EVENT__HAVE_UINT16_T 1 */ + +/* Define to 1 if the system has the type `uint32_t'. */ +/* #define EVENT__HAVE_UINT32_T 1 */ + +/* Define to 1 if the system has the type `uint64_t'. */ +/* #define EVENT__HAVE_UINT64_T 1 */ + +/* Define to 1 if the system has the type `uint8_t'. */ +/* #define EVENT__HAVE_UINT8_T 1 */ + +/* Define to 1 if you have the header file. */ +/* #define EVENT__HAVE_UNISTD_H 1 */ + +/* Define to 1 if you have the `vasprintf' function. */ +/* #undef EVENT__HAVE_VASPRINTF */ + +/* Define if kqueue works correctly with pipes */ +/* #undef EVENT__HAVE_WORKING_KQUEUE */ + +/* Numeric representation of the version */ +#define EVENT__NUMERIC_VERSION 0x02020001 + +/* Name of package */ +#define EVENT__PACKAGE "libevent" + +/* Define to the address where bug reports for this package should be sent. */ +#define EVENT__PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define EVENT__PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define EVENT__PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define EVENT__PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define EVENT__PACKAGE_VERSION "" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef EVENT__PTHREAD_CREATE_JOINABLE */ + +/* The size of a `int', as computed by sizeof. */ +#define EVENT__SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define EVENT__SIZEOF_LONG 4 + +/* The size of a `long long', as computed by sizeof. */ +#define EVENT__SIZEOF_LONG_LONG 8 + +/* The size of a `short', as computed by sizeof. */ +#define EVENT__SIZEOF_SHORT 2 + +/* The size of `size_t', as computed by sizeof. */ +#ifdef _WIN64 +#define EVENT__SIZEOF_SIZE_T 8 +#else +#define EVENT__SIZEOF_SIZE_T 4 +#endif + +/* The size of `void *', as computed by sizeof. */ +#ifdef _WIN64 +#define EVENT__SIZEOF_VOID_P 8 +#else +#define EVENT__SIZEOF_VOID_P 4 +#endif + +/* The size of `time_t`, as computed by sizeof. */ +#ifdef _WIN64 +#define EVENT__SIZEOF_TIME_T 8 +#else +#define EVENT__SIZEOF_TIME_T 4 +#endif + +/* Define to 1 if you have the ANSI C header files. */ +#define EVENT__STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define EVENT__TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define EVENT__VERSION "2.2.0-alpha-dev" + +/* Define to appropriate substitue if compiler doesnt have __func__ */ +#define EVENT____func__ __FUNCTION__ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef _EVENT___cplusplus +#define EVENT__inline __inline +#endif + +/* Define to `int' if does not define. */ +#undef EVENT__pid_t + +/* Define to `unsigned' if does not define. */ + #undef EVENT__size_t + +/* Define to unsigned int if you dont have it */ +#define EVENT__socklen_t unsigned int + +/* Define to `int' if does not define. */ +#define EVENT__ssize_t int +//SSIZE_T + +#endif diff --git a/android/third-party/OpenSSL/ApplicationManifest.xml b/android/third-party/OpenSSL/ApplicationManifest.xml new file mode 100644 index 000000000..60bb67e6a --- /dev/null +++ b/android/third-party/OpenSSL/ApplicationManifest.xml @@ -0,0 +1,4 @@ + + + diff --git a/android/third-party/OpenSSL/build.gradle b/android/third-party/OpenSSL/build.gradle new file mode 100644 index 000000000..4f969db72 --- /dev/null +++ b/android/third-party/OpenSSL/build.gradle @@ -0,0 +1,37 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion rootProject.compileSdkVersion + buildToolsVersion rootProject.buildToolsVersion + + defaultConfig { + minSdkVersion rootProject.minSdkVersion + targetSdkVersion rootProject.targetSdkVersion + ndk { + abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a' 'x86_64' + } + + externalNativeBuild { + ndkBuild { + arguments "NDK_APPLICATION_MK:=$projectDir/jni/Application.mk", + "NDK_TOOLCHAIN_VERSION:=clang", + "NDK_PROJECT_PATH:=openssl-android-1.0.0" + cppFlags "-fPIC" + } + } + } + externalNativeBuild { + ndkBuild { + path "$projectDir/jni/Android.mk" + } + } + lintOptions { + abortOnError false + } + sourceSets { + main { + manifest.srcFile './ApplicationManifest.xml' + } + } +} +#abiFilters 'x86', 'arm64-v8a', 'x86_64' diff --git a/android/third-party/OpenSSL/libs/arm64-v8a/libcrypto.so b/android/third-party/OpenSSL/libs/arm64-v8a/libcrypto.so new file mode 100755 index 000000000..3bcbfa949 Binary files /dev/null and b/android/third-party/OpenSSL/libs/arm64-v8a/libcrypto.so differ diff --git a/android/third-party/OpenSSL/libs/arm64-v8a/libssl.so b/android/third-party/OpenSSL/libs/arm64-v8a/libssl.so new file mode 100755 index 000000000..00e3f440e Binary files /dev/null and b/android/third-party/OpenSSL/libs/arm64-v8a/libssl.so differ diff --git a/android/third-party/OpenSSL/libs/arm64-v8a/openssl b/android/third-party/OpenSSL/libs/arm64-v8a/openssl new file mode 100755 index 000000000..a3b579292 Binary files /dev/null and b/android/third-party/OpenSSL/libs/arm64-v8a/openssl differ diff --git a/android/third-party/OpenSSL/libs/arm64-v8a/ssltest b/android/third-party/OpenSSL/libs/arm64-v8a/ssltest new file mode 100755 index 000000000..e5801732f Binary files /dev/null and b/android/third-party/OpenSSL/libs/arm64-v8a/ssltest differ diff --git a/android/third-party/OpenSSL/libs/armeabi-v7a/libcrypto.so b/android/third-party/OpenSSL/libs/armeabi-v7a/libcrypto.so new file mode 100755 index 000000000..615086aa6 Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi-v7a/libcrypto.so differ diff --git a/android/third-party/OpenSSL/libs/armeabi-v7a/libssl.so b/android/third-party/OpenSSL/libs/armeabi-v7a/libssl.so new file mode 100755 index 000000000..532a8f63b Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi-v7a/libssl.so differ diff --git a/android/third-party/OpenSSL/libs/armeabi-v7a/openssl b/android/third-party/OpenSSL/libs/armeabi-v7a/openssl new file mode 100755 index 000000000..ed0997f8d Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi-v7a/openssl differ diff --git a/android/third-party/OpenSSL/libs/armeabi-v7a/ssltest b/android/third-party/OpenSSL/libs/armeabi-v7a/ssltest new file mode 100755 index 000000000..d80b72172 Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi-v7a/ssltest differ diff --git a/android/third-party/OpenSSL/libs/armeabi/libcrypto.so b/android/third-party/OpenSSL/libs/armeabi/libcrypto.so new file mode 100755 index 000000000..0161f199c Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi/libcrypto.so differ diff --git a/android/third-party/OpenSSL/libs/armeabi/libssl.so b/android/third-party/OpenSSL/libs/armeabi/libssl.so new file mode 100755 index 000000000..4589c7219 Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi/libssl.so differ diff --git a/android/third-party/OpenSSL/libs/armeabi/openssl b/android/third-party/OpenSSL/libs/armeabi/openssl new file mode 100755 index 000000000..11dd86fdb Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi/openssl differ diff --git a/android/third-party/OpenSSL/libs/armeabi/ssltest b/android/third-party/OpenSSL/libs/armeabi/ssltest new file mode 100755 index 000000000..be7838aba Binary files /dev/null and b/android/third-party/OpenSSL/libs/armeabi/ssltest differ diff --git a/android/third-party/OpenSSL/libs/x86/libcrypto.so b/android/third-party/OpenSSL/libs/x86/libcrypto.so new file mode 100755 index 000000000..4c42b213d Binary files /dev/null and b/android/third-party/OpenSSL/libs/x86/libcrypto.so differ diff --git a/android/third-party/OpenSSL/libs/x86/libssl.so b/android/third-party/OpenSSL/libs/x86/libssl.so new file mode 100755 index 000000000..2fd0bd9bb Binary files /dev/null and b/android/third-party/OpenSSL/libs/x86/libssl.so differ diff --git a/android/third-party/OpenSSL/libs/x86/openssl b/android/third-party/OpenSSL/libs/x86/openssl new file mode 100755 index 000000000..955536f66 Binary files /dev/null and b/android/third-party/OpenSSL/libs/x86/openssl differ diff --git a/android/third-party/OpenSSL/libs/x86/ssltest b/android/third-party/OpenSSL/libs/x86/ssltest new file mode 100755 index 000000000..c0f22b1c2 Binary files /dev/null and b/android/third-party/OpenSSL/libs/x86/ssltest differ diff --git a/settings.gradle b/settings.gradle index b903bd44c..89dca32b6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,6 +18,8 @@ include ':sample' include ':doubleconversion' include ':glog' include ':libevent' +include ':openssl' + project(':fbjni').projectDir = file('libs/fbjni') @@ -29,3 +31,4 @@ project(':doubleconversion').projectDir = file('android/build/third-party-ndk/do project(':glog').projectDir = file('android/build/third-party-ndk/glog/') project(':folly').projectDir = file('android/build/third-party-ndk/folly/') project(':libevent').projectDir = file('android/build/third-party-ndk/LibEvent/') +project(':openssl').projectDir = file('android/build/third-party-ndk/OpenSSL/openssl-android-1.0.0')