Build against vanilla OpenSSL 1.1.0h (#125)
Summary: This uses OpenSSL 1.1.0h to build and link against. The `.so`s are precompiled and hand-patched from [this repository](https://github.com/passy/android-database-sqlcipher). The patching was necessary to fix the `SONAME` and corresponding `NEEDED` flags to *not* contain a `.1.1` version suffix as Gradle will refuse to bundle those. We basically only use the headers for the remaining part. The precompiled version contains ABI support for `arm64-v8a`, `armeabi`, `armeabi-v7a`, `x86` and most importantly `x86_64`. HOWEVER, `x86_64` is still excluded for now because folly fails to compile due to a missing compiler flag: ``` error: needs target feature pclmul ``` This should be easily fixable by ensuring that `-mpclmul` is added to the CFLAGS if we're compiling for an `x86_64` target in the `CMakeLists.txt` for Folly. Closes #113. Closes https://github.com/facebook/Sonar/pull/125 Reviewed By: priteshrnandgaonkar Differential Revision: D8723636 Pulled By: passy fbshipit-source-id: 41c61047d2793ebaef5793a3c937c4d628471d6a
This commit is contained in:
committed by
Facebook Github Bot
parent
bcc47bfe0c
commit
69711642c9
@@ -13,7 +13,7 @@ set(glog_DIR ${third_party_ndk}/glog)
|
||||
set(BOOST_DIR ${third_party_ndk}/boost/boost_1_63_0/)
|
||||
set(LIBEVENT_DIR ${third_party_ndk}/LibEvent/libevent-release-2.1.9/)
|
||||
set(DOUBLECONVERSION_DIR ${third_party_ndk}/double-conversion/double-conversion-3.0.0/)
|
||||
set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-android-1.0.0/)
|
||||
set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-1.1.0h/)
|
||||
|
||||
list(APPEND dir_list ./)
|
||||
list(APPEND dir_list ./Sonar)
|
||||
@@ -61,9 +61,7 @@ target_include_directories(${PACKAGE_NAME} PRIVATE
|
||||
${rsocket_DIR}/rsocket-cpp-0.10.1
|
||||
${LIBEVENT_DIR}/include/
|
||||
${LIBEVENT_DIR}/include/event2
|
||||
${OPENSSL_DIR}/jni/openssl-android/
|
||||
${OPENSSL_DIR}/jni/openssl-android/include
|
||||
${OPENSSL_DIR}/jni/openssl-android/include/openssl
|
||||
${OPENSSL_DIR}/include
|
||||
${glog_DIR}
|
||||
${glog_DIR}/../
|
||||
${glog_DIR}/glog-0.3.5/src/
|
||||
|
||||
Reference in New Issue
Block a user