diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2022-03-21 11:05:38 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2022-03-23 06:36:25 +0200 |
| commit | 686481f48c6b3bb18a74616c7ce6a636dd0460cc (patch) | |
| tree | 65fb584c2743d11481cc32e68fd81c99a5604fd8 | |
| parent | 4ec029b83f89c80519536b40166a2e1a0ad80793 (diff) | |
Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m
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
Pick-to: dev 6.3 6.2
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>
| -rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 1284b512..0bfaa127 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -54,11 +54,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}" @@ -70,7 +70,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 |