diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-18 12:51:06 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-31 00:16:02 +0000 |
| commit | 9a122f39ef8d64a37e71a667fbe13b841c43be28 (patch) | |
| tree | e19396294477978a0089cddf16d60dad5e087cd1 /util | |
| parent | 90ee5721b4bfc8de5393f1bc049fd9feb2991987 (diff) | |
Rename deprecated ANDROID_SDK_HOME to ANDROID_SDK_ROOT
Task-number: QTBUG-97002
Change-Id: I777491f542e5388e04ed4c1b7ff5d9db75f9e778
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a81f24ada5cb125b2f19dc399b2c51dc7cd6ac99)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/android/android_emulator_launcher.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/android/android_emulator_launcher.sh b/util/android/android_emulator_launcher.sh index 06cc00a0c7..fe8b164b9b 100755 --- a/util/android/android_emulator_launcher.sh +++ b/util/android/android_emulator_launcher.sh @@ -33,8 +33,8 @@ set -ex EMULATOR_TIMEOUT=30 EMULATOR_MAX_RETRIES=5 -EMULATOR_EXEC="$ANDROID_SDK_HOME/emulator/emulator" -ADB_EXEC="$ANDROID_SDK_HOME/platform-tools/adb" +EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator" +ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb" if [[ -z "${ANDROID_EMULATOR}" ]]; then EMULATOR_NAME="@x86emulator" else |