Provisioning: Change Android-openssl installation

Also Android openssl version udpated to the latest one, 1.0.2t

Task-number: QTQAINFRA-3258
Task-number: QTQAINFRA-3336
Change-Id: I91572d26801d9c000523c85489d1eeb133d542ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Heikki Halmet
2019-11-04 15:36:23 +02:00
parent 4c53e12dd5
commit 392b6a0329

View File

@@ -39,31 +39,41 @@
# Msys need to be installed to target machine
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.0.2p"
$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
$destination = "C:\Utils\openssl-android-master"
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils
Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
Rename-Item C:\Utils\openssl-$version $destination
Remove-Item -Path $zip
Remove-Item C:\Utils\openssl-$version.tar
# Android openssl was preconfigured manually. More info in jira ticket https://bugreports.qt.io/browse/QTQAINFRA-3258
# Android openssl was configured with following way and cached to ci-files01-hki.intra.qt.io\provisioning\openssl\.
#################################################################
## $version = "1.0.2p"
## $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
## $sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
## $destination = "C:\Utils\openssl-android-master"
## Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
## Verify-Checksum $zip $sha1
## Extract-7Zip $zip C:\Utils
## Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
## Rename-Item C:\Utils\openssl-$version $destination
## Remove-Item -Path $zip
## Remove-Item C:\Utils\openssl-$version.tar
## Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
## Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
## Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
### Make sure configure for openssl has a "make" and "perl" available
## $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
## Write-Host "Configuring OpenSSL $version for Android..."
## Push-Location $destination
## Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
## Pop-Location
### Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
## C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
#################################################################
Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
# Make sure configure for openssl has a "make" and "perl" available
$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
Write-Host "Configuring OpenSSL $version for Android..."
Push-Location $destination
Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
Pop-Location
# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
$version = "1.0.2t"
$zip = "c:\users\qt\downloads\openssl-$version.7z"
$sha1 = "6670ff13906a04fdbfe0fcbc075ff21839dca984"
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils
Remove-Item -Path $zip