diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2020-08-04 14:34:19 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2020-09-08 14:52:22 +0300 |
| commit | e3600116b3321001243767ddffb1846db3de2eb9 (patch) | |
| tree | 1c4e1063b6237560f20b9253f268c8f984862655 /coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | |
| parent | bfe83a7ea2a415f2067a163796149f6468eda710 (diff) | |
Provisioning: Update Android ndk and build tools
Task-number: QTQAINFRA-3846
Change-Id: I5d3c0efce86e3b8bc3c6070ed4a9e438647bb955
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index aa0935f0..094dc356 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -47,11 +47,11 @@ sdkTargetFolder="$targetFolder/sdk" basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" -toolsVersion="r26.1.1" +toolsVersion="2.1" # toolsFile dertermines tools version -toolsFile="sdk-tools-darwin-4333796.zip" +toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r20" +ndkVersion="r21d" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version @@ -71,8 +71,11 @@ sudo chown -R qt:wheel "$targetFolder" # Run the following command under `eval` or `sh -c` so that the shell properly splits it sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" +sudo mkdir "$sdkTargetFolder/cmdline-tools" +sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools" + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") | "$sdkTargetFolder/tools/bin/sdkmanager" \ +(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \ "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ | eval $sdkmanager_no_progress_bar_cmd |