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

Fix Openssl android installation

Browse Source 
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.

Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 96fe74b540)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Heikki Halmet
2022-03-07 17:02:01 +02:00
committed by Qt Cherry-pick Bot
parent ed8d1c76ae
commit 98f696ce30
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,15 +52,16 @@ if (Is64BitWinHost) {
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.1.1m"
$ndk_version = "r22b"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip")
$sha1 = "39d424c4411e45f1570073d7a71b1830b96007ca"
$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
$prebuilt_sha1 = "860a7e675bf177e1d929d7594ef4efcf07838327"
$destination = "C:\Utils\openssl-android-master"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip"
# msys unix style paths
$ndkPath = "/c/Utils/Android/android-ndk-r22b"
$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
$openssl_path = "/c/Utils/openssl-android-master"
$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
if ((Test-Path $prebuilt_url)) {