diff options
author | Juha Karjalainen <juha.karjalainen@qt.io> | 2018-11-30 16:17:07 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-12-18 08:20:41 +0000 |
commit | cbdd122e18a067a4564791786c4bb2a7c0d67350 (patch) | |
tree | b15a694d90d5c78da6c1e2b6a926e1e560853a3e /coin/provisioning/common/windows | |
parent | 2a7ea7c53dfa66c8d53445aeae6776516236a730 (diff) |
Provisioning: Update install android sdk to version 28
QT needs at least buildSdk 24 after commit
70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk
version to 28. Please note minSDK <= targetSDK <= build/compileSDK.
Task-number: QTQAINFRA-2412
Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows')
-rw-r--r-- | coin/provisioning/common/windows/android.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index cd98b747..90c33fbd 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -51,7 +51,7 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" $toolsVersion = "26.1.1" $toolsFile = "sdk-tools-windows-4333796.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-21" +$sdkApiLevel = "android-28" $sdkBuildToolsVersion = "28.0.3" $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" @@ -95,7 +95,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 # Get a PATH where Java's path is defined from previous provisioning [Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process") -$sdkmanager_args += " platforms;$sdkApiLevel tools platform-tools build-tools;$sdkBuildToolsVersion" +$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion" Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args" cd $toolsFolder\bin\ $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' |