diff options
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 | 15 |
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" |