diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2022-03-07 17:02:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-17 11:28:30 +0000 |
| commit | 98f696ce30f542f4c93deb2379eee67a92aba63b (patch) | |
| tree | b1180adb45225aa0b1ea9f751493531dfe67425b | |
| parent | ed8d1c76ae4a88d4e73b575c07fbc625e5b8e22c (diff) | |
Fix Openssl android installation
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 96fe74b5403b531b67fd3a77cb10c7e1dfc3fced)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5b564dbf..1284b512 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -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)) { |