diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-05-27 13:58:26 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-06-02 21:02:41 +0300 |
| commit | e75bd6e09a1b658eba62e0348e3823c037ddb928 (patch) | |
| tree | d0dfe6fb2360a189c45a6618499bfd30879eac8e /util | |
| parent | 01e35a2145ba8afff69e53ea967a15a103a1631b (diff) | |
Add option to use different ANDROID_EMULATOR
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>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/android/android_emulator_launcher.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/util/android/android_emulator_launcher.sh b/util/android/android_emulator_launcher.sh index 867c6a1338..c5c35bea00 100755 --- a/util/android/android_emulator_launcher.sh +++ b/util/android/android_emulator_launcher.sh @@ -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 |