mirror of
https://github.com/izzy2lost/android_openssl.git
synced 2026-06-19 01:20:12 -07:00
Add _1_1 suffix
_1_1 suffix is needed for Android API-21 because if the user tries to load libssl.so/libcrypto.so it will load the system ones which are actually OpenSSL 1.0
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+5
-5
@@ -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
|
||||
|
||||
+8
-8
@@ -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
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user