diff --git a/arm/libcrypto.so b/arm/libcrypto_1_1.so similarity index 89% rename from arm/libcrypto.so rename to arm/libcrypto_1_1.so index 32fbd10..8bbe4ae 100755 Binary files a/arm/libcrypto.so and b/arm/libcrypto_1_1.so differ diff --git a/arm/libssl.so b/arm/libssl_1_1.so similarity index 82% rename from arm/libssl.so rename to arm/libssl_1_1.so index 805a6c2..a94a3c2 100755 Binary files a/arm/libssl.so and b/arm/libssl_1_1.so differ diff --git a/arm64/libcrypto.so b/arm64/libcrypto_1_1.so similarity index 99% rename from arm64/libcrypto.so rename to arm64/libcrypto_1_1.so index c263af2..bf99492 100755 Binary files a/arm64/libcrypto.so and b/arm64/libcrypto_1_1.so differ diff --git a/arm64/libssl.so b/arm64/libssl_1_1.so similarity index 99% rename from arm64/libssl.so rename to arm64/libssl_1_1.so index bde4f0b..7ff2123 100755 Binary files a/arm64/libssl.so and b/arm64/libssl_1_1.so differ diff --git a/build_ssl.sh b/build_ssl.sh index c7d5a2f..f3b7364 100755 --- a/build_ssl.sh +++ b/build_ssl.sh @@ -43,10 +43,10 @@ do ./Configure shared android-${arch} -D__ANDROID_API__=${ANDROID_API} || exit 1 make depend - make -j$(nproc) SHLIB_VERSION_NUMBER= SHLIB_EXT=.so build_libs || exit 1 - llvm-strip -strip-all libcrypto.so - llvm-strip -strip-all libssl.so - cp libcrypto.so ../$arch - cp libssl.so ../$arch + make -j$(nproc) SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs || exit 1 + llvm-strip -strip-all libcrypto_1_1.so + llvm-strip -strip-all libssl_1_1.so + cp libcrypto_1_1.so ../$arch + cp libssl_1_1.so ../$arch cd .. done diff --git a/openssl.pri b/openssl.pri index 5f588fc..510b86c 100644 --- a/openssl.pri +++ b/openssl.pri @@ -1,23 +1,23 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) { ANDROID_EXTRA_LIBS += \ - $$PWD/arm/libcrypto.so \ - $$PWD/arm/libssl.so + $$PWD/arm/libcrypto_1_1.so \ + $$PWD/arm/libssl_1_1.so } contains(ANDROID_TARGET_ARCH,arm64-v8a) { ANDROID_EXTRA_LIBS += \ - $$PWD/arm64/libcrypto.so \ - $$PWD/arm64/libssl.so + $$PWD/arm64/libcrypto_1_1.so \ + $$PWD/arm64/libssl_1_1.so } contains(ANDROID_TARGET_ARCH,x86) { ANDROID_EXTRA_LIBS += \ - $$PWD/x86/libcrypto.so \ - $$PWD/x86/libssl.so + $$PWD/x86/libcrypto_1_1.so \ + $$PWD/x86/libssl_1_1.so } contains(ANDROID_TARGET_ARCH,x86_64) { ANDROID_EXTRA_LIBS += \ - $$PWD/x86_64/libcrypto.so \ - $$PWD/x86_64/libssl.so + $$PWD/x86_64/libcrypto_1_1.so \ + $$PWD/x86_64/libssl_1_1.so } diff --git a/x86/libcrypto.so b/x86/libcrypto_1_1.so similarity index 92% rename from x86/libcrypto.so rename to x86/libcrypto_1_1.so index ce5ddb6..7e586c7 100755 Binary files a/x86/libcrypto.so and b/x86/libcrypto_1_1.so differ diff --git a/x86/libssl.so b/x86/libssl_1_1.so similarity index 91% rename from x86/libssl.so rename to x86/libssl_1_1.so index 09febf7..839047e 100755 Binary files a/x86/libssl.so and b/x86/libssl_1_1.so differ diff --git a/x86_64/libcrypto.so b/x86_64/libcrypto_1_1.so similarity index 93% rename from x86_64/libcrypto.so rename to x86_64/libcrypto_1_1.so index 82c2aac..bc40796 100755 Binary files a/x86_64/libcrypto.so and b/x86_64/libcrypto_1_1.so differ diff --git a/x86_64/libssl.so b/x86_64/libssl_1_1.so similarity index 72% rename from x86_64/libssl.so rename to x86_64/libssl_1_1.so index 0b8a4af..d55cbca 100755 Binary files a/x86_64/libssl.so and b/x86_64/libssl_1_1.so differ