lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 11:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m

Browse Source 
Used OpenSSL source package 1.1.1m was changed little bit. All
ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in
Configurations/15-android.conf file

Task-number: QTQAINFRA-4864
Task-number: QTBUG-101863
Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 686481f48c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Heikki Halmet
2022-03-21 11:05:38 +02:00
committed by Qt Cherry-pick Bot
parent 1415259122
commit 5f28d0680c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coin/provisioning/common/windows/android-openssl.ps1
View File

@@ -48,11 +48,11 @@ if (Is64BitWinHost) {
$version = "1.1.1m"
$ndk_version = "r22b"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip")
$sha1 = "39d424c4411e45f1570073d7a71b1830b96007ca"
$prebuilt_sha1 = "860a7e675bf177e1d929d7594ef4efcf07838327"
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
$destination = "C:\Utils\openssl-android-master"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
# msys unix style paths
$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
@@ -64,7 +64,8 @@ if ((Test-Path $prebuilt_url)) {
Extract-7Zip $prebuilt_zip C:\Utils
Remove $prebuilt_zip
} else {
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
# openssl-${version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils\tmp