From 6f0e2bb5f269ab2310344994971199186532ee9d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 7 Mar 2022 17:02:01 +0200 Subject: Fix Openssl android installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 96fe74b5403b531b67fd3a77cb10c7e1dfc3fced) Reviewed-by: Simo Fält --- coin/provisioning/common/windows/android-openssl.ps1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5d966c45..c013952c 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -46,15 +46,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)) { -- cgit v1.2.3