summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2022-04-28 17:00:00 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-05-19 12:43:53 +0000
commitc39c551ccaaa291dff37b09310ca3bb4bb1515e5 (patch)
tree9f68496d8f0f5a3e195b79d4408df0596797d3fa /util
parenteacb3f18a8d246093c1810b59b1b3b8a2f350a14 (diff)
Android: fix default name of the CI emulator
This name was changed in qt5/coin but wasn't reflected here. Currently, things works correctly because the test target provide the correct name as an env var. Change-Id: I8968285de2c7759d16f303c48d6295295dffbef6 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 53604df833c3cb99375763dfd7a068ac61ef8eb2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
-rwxr-xr-xutil/android/android_emulator_launcher.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/android/android_emulator_launcher.sh b/util/android/android_emulator_launcher.sh
index df40997fdb..4d59d2d263 100755
--- a/util/android/android_emulator_launcher.sh
+++ b/util/android/android_emulator_launcher.sh
@@ -37,7 +37,7 @@ EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator"
ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb"
if [ -z "${ANDROID_EMULATOR}" ]
then
- EMULATOR_NAME="@x86emulator"
+ EMULATOR_NAME="@emulator_x86_api_23"
else
EMULATOR_NAME="$ANDROID_EMULATOR"
fi