From d4453a5f38be4ee7f0fe7ff64d8d22b8b43ab53b Mon Sep 17 00:00:00 2001 From: albexk Date: Sun, 14 Apr 2024 14:07:26 +0300 Subject: [PATCH] Add openssl .so libs for Android --- client/3rd-prebuilt | 2 +- client/cmake/android.cmake | 2 ++ client/main.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/3rd-prebuilt b/client/3rd-prebuilt index 3704ff36..ca51a33d 160000 --- a/client/3rd-prebuilt +++ b/client/3rd-prebuilt @@ -1 +1 @@ -Subproject commit 3704ff36363f7269387f6d1d2546eb8700f79f4b +Subproject commit ca51a33df4a4b9feead5f7685c5cb2e53616f012 diff --git a/client/cmake/android.cmake b/client/cmake/android.cmake index 9dbef371..d3ba196d 100644 --- a/client/cmake/android.cmake +++ b/client/cmake/android.cmake @@ -49,6 +49,8 @@ foreach(abi IN ITEMS ${QT_ANDROID_ABIS}) ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpn3.so ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpnutil.so ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/librsapss.so + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl/android/${abi}/libcrypto_3.so + ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl/android/${abi}/libssl_3.so ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/libssh/android/${abi}/libssh.so ) endforeach() diff --git a/client/main.cpp b/client/main.cpp index 540ee6fd..77c91fbc 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -29,6 +29,7 @@ int main(int argc, char *argv[]) #ifdef Q_OS_ANDROID // QTBUG-95974 QTBUG-95764 QTBUG-102168 qputenv("QT_ANDROID_DISABLE_ACCESSIBILITY", "1"); + qputenv("ANDROID_OPENSSL_SUFFIX", "_3"); #endif #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)