From cbdd122e18a067a4564791786c4bb2a7c0d67350 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Fri, 30 Nov 2018 16:17:07 +0200 Subject: 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 --- coin/provisioning/common/linux/android_linux.sh | 8 ++++---- coin/provisioning/common/windows/android.ps1 | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 8ff773a3..c77af943 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -54,7 +54,7 @@ toolsFile="sdk-tools-linux-4333796.zip" ndkVersion="r18b" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" -sdkApiLevel="android-21" +sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" @@ -80,14 +80,14 @@ else sudo chown -R qt:users "$targetFolder" fi -echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." +echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo "$proxy" | cut -d':' -f3) - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" else - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" fi echo "Checking the contents of Android SDK..." 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' -- cgit v1.2.3