lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-31 10:47:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: Begin initial alignment of Linux and macOS provisioning

Browse Source 
The Android provisioning scripts on macOS and Linux perform many of the
same tasks, but with slightly differing approaches. Future patches will
make us run Android emulators on ARM64, which will further make these
scripts similar.

This patch performs some modifications to the macOS provisioning script
to make it more similar to the Linux one. This will help us combine
parts of these scripts in the future.

Task-number: QTQAINFRA-7487
Pick-to: 6.10 6.8
Change-Id: Idba30d07607780d1ef8c60cc5e038a034c821632
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 8a70b9e482)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Nils Petter Skålerud
2025-11-13 12:00:21 +01:00
committed by Qt Cherry-pick Bot
parent fee8bfc9a9
commit 39cfe5772c
2 changed files with 68 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/common/linux/android_linux.sh
View File

@@ -6,7 +6,7 @@
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
set -e
set -ex
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
@@ -145,7 +145,9 @@ cat >>~/versions.txt <<EOB
Android SDK tools = $toolsVersion
Android SDK Build Tools = $sdkBuildToolsVersion
Android SDK API level = $sdkApiLevel
Android NDK = $ndkVersion
Android NDK latest = $ndkVersionLatest
Android NDK nightly1 = $ndkVersionNightly1
Android NDK nightly2 = $ndkVersionNightly2
EOB
cd "$sdkTargetFolder/cmdline-tools/tools/bin"