diff --git a/Android/app/libs/arm64-v8a/libcrypto.a b/Android/app/libs/arm64-v8a/libcrypto.a new file mode 100644 index 00000000..a1cb98f0 Binary files /dev/null and b/Android/app/libs/arm64-v8a/libcrypto.a differ diff --git a/Android/app/libs/arm64-v8a/libcrypto.so b/Android/app/libs/arm64-v8a/libcrypto.so new file mode 100644 index 00000000..28b8fefe Binary files /dev/null and b/Android/app/libs/arm64-v8a/libcrypto.so differ diff --git a/Android/app/libs/arm64-v8a/libssl.a b/Android/app/libs/arm64-v8a/libssl.a new file mode 100644 index 00000000..e586e151 Binary files /dev/null and b/Android/app/libs/arm64-v8a/libssl.a differ diff --git a/Android/app/libs/arm64-v8a/libssl.so b/Android/app/libs/arm64-v8a/libssl.so new file mode 100644 index 00000000..af218036 Binary files /dev/null and b/Android/app/libs/arm64-v8a/libssl.so differ diff --git a/Android/app/src/main/cpp/CMakeLists.txt b/Android/app/src/main/cpp/CMakeLists.txt index a2b1e58e..64585f55 100644 --- a/Android/app/src/main/cpp/CMakeLists.txt +++ b/Android/app/src/main/cpp/CMakeLists.txt @@ -10,26 +10,26 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libs_export/${ANDROID_ABI set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/${ANDROID_ABI}") #由于openssl库编译时未指定-fPIC,到时github action ci编译失败,先屏蔽掉 -#set(OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include") -#set(OPENSSL_CRYPTO_LIBRARY "${OPENSSL_ROOT_DIR}/libcrypto.a") -#set(OPENSSL_SSL_LIBRARY "${OPENSSL_ROOT_DIR}/libssl.a") +set(OPENSSL_INCLUDE_DIR "3rdpart/openssl/include") +set(OPENSSL_CRYPTO_LIBRARY "Android/app/libs/arm64-v8a/libcrypto.a") +set(OPENSSL_SSL_LIBRARY "Android/app/libs/arm64-v8a/libssl.a") ################################################################### # 编译openssl 1.1.1k -if (ANDROID) - message(WARNING "Enable Android openssl compile") - execute_process( - COMMAND bash -c "./../../3rdpart/openssl/Configure android-aarch64 -D__ANDROID_API__=16" - OUTPUT_VARIABLE output - RESULT_VARIABLE result - ) - if (result) - message(FATAL_ERROR "Failed to execute bash command: ${result}") - endif () - message(WARNING "Enable Android openssl compile===================") - message("Output: ${output}") -ENDIF () +#if (ANDROID) +# message(WARNING "Enable Android openssl compile") +# execute_process( +# COMMAND bash -c "./../../3rdpart/openssl/Configure android-aarch64 -D__ANDROID_API__=16" +# OUTPUT_VARIABLE output +# RESULT_VARIABLE result +# ) +# if (result) +# message(FATAL_ERROR "Failed to execute bash command: ${result}") +# endif () +# message(WARNING "Enable Android openssl compile===================") +# message("Output: ${output}") +#ENDIF () #设置工程源码根目录 set(JNI_Root ${CMAKE_CURRENT_SOURCE_DIR})