summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-macos-10.13-x86_64
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-10-02 08:50:31 +0300
committerLiang Qi <liang.qi@qt.io>2018-10-20 05:16:02 +0000
commit4667cfc432a97bf0400c2e4ecf2c1fbd535eae63 (patch)
treee9a809eb7ef2de74d1d3577b4581030622d312e1 /coin/provisioning/qtci-macos-10.13-x86_64
parentbc5e5baf55641b7b49e7dc4bedc796e2abbcb701 (diff)
Update Android NDK and SDK on macOS envs
Task-number: QTQAINFRA-2244 Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/30-android.sh15
1 files changed, 9 insertions, 6 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 a86387bb..717a0767 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
@@ -47,15 +47,15 @@ sdkTargetFolder="$targetFolder/sdk"
basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
-toolsVersion="r25.2.5"
-toolsFile="tools_$toolsVersion-macosx.zip"
-ndkVersion="r16b"
+toolsVersion="r26.1.1"
+toolsFile="sdk-tools-darwin-4333796.zip"
+ndkVersion="r18b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="25.0.2"
+sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-21"
-toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
-ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de"
+toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
+ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
@@ -73,6 +73,9 @@ 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 "Checking the contents of Android SDK..."
+ls -l "$sdkTargetFolder"
+
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"