1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add option to use different ANDROID_EMULATOR

Browse Source 
This change add option to determine used Android emulator version using
environment variable. If variable is not set @x86emulator will be used
as default value.

Change-Id: Ifc52d07d058bf078bf915ca78683822a966b58fb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Heikki Halmet 2021-05-27 13:58:26 +03:00
parent 01e35a2145
commit e75bd6e09a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/android/android_emulator_launcher.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2021 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the plugins of the Qt Toolkit.
@ -35,7 +35,11 @@ EMULATOR_TIMEOUT=30
EMULATOR_MAX_RETRIES=5
EMULATOR_EXEC="$ANDROID_SDK_HOME/tools/emulator"
ADB_EXEC="$ANDROID_SDK_HOME/platform-tools/adb"
EMULATOR_NAME="@x86emulator"
if [[ -z "${ANDROID_EMULATOR}" ]]; then
EMULATOR_NAME="@x86emulator"
else
EMULATOR_NAME="$ANDROID_EMULATOR"
fi
RESULT=0
for counter in `seq 1 ${EMULATOR_MAX_RETRIES}`; do