diff options
| author | Simo Fält <simo.falt@qt.io> | 2017-08-18 12:32:37 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-17 09:45:05 +0000 |
| commit | 6d2929d1aaa97454619725211eee4ff65c54b95e (patch) | |
| tree | 56618ccb7e63e9ce8a3dc086990bbeac0c6b71e2 /coin/provisioning/common | |
| parent | ea0825abe8aadf927376f25620c2e6053470a4ee (diff) | |
Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template
and moving Android windows platform configs to win10 from win7.
Task-number: QTQAINFRA-1266
Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5a040ca46a46a3a45fa61036ca5115c4d0819034)
Diffstat (limited to 'coin/provisioning/common')
| -rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/msys.ps1 | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5390dfae..4fe5e5ee 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -54,7 +54,7 @@ Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" +Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" # Make sure configure for openssl has a "make" and "perl" available diff --git a/coin/provisioning/common/windows/msys.ps1 b/coin/provisioning/common/windows/msys.ps1 new file mode 100644 index 00000000..df67cc20 --- /dev/null +++ b/coin/provisioning/common/windows/msys.ps1 @@ -0,0 +1,16 @@ +. "$PSScriptRoot\helpers.ps1" + +# This script will install msys which is needed for configuring openssl for Android + +$version = "1.0.11" +$url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z" + +$zip = Get-DownloadLocation ("msys-$version.7z") +$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" +$destination = "C:\msys" + +Download $url $url $zip +Verify-Checksum $zip $sha1 +C:\Utils\sevenzip\7z.exe x $zip -oC:\ + +Write-Output "Msys = $version" >> ~/versions.txt |