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/qtci-macos-10.13-x86_64 | |
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/qtci-macos-10.13-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 717a0767..9d7467ef 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -48,11 +48,14 @@ sdkTargetFolder="$targetFolder/sdk" basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" toolsVersion="r26.1.1" +# toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" + ndkVersion="r18b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" -sdkApiLevel="android-21" +# this is compile sdk version +sdkApiLevel="android-28" toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" @@ -70,8 +73,8 @@ sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" echo "Changing ownership of Android files." sudo chown -R qt:wheel "$targetFolder" -echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" +echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." +(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" echo "Checking the contents of Android SDK..." ls -l "$sdkTargetFolder" |