From 9a122f39ef8d64a37e71a667fbe13b841c43be28 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 18 Oct 2021 12:51:06 +0300 Subject: [PATCH] Rename deprecated ANDROID_SDK_HOME to ANDROID_SDK_ROOT Task-number: QTBUG-97002 Change-Id: I777491f542e5388e04ed4c1b7ff5d9db75f9e778 Reviewed-by: Heikki Halmet (cherry picked from commit a81f24ada5cb125b2f19dc399b2c51dc7cd6ac99) Reviewed-by: Qt Cherry-pick Bot --- util/android/android_emulator_launcher.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/android/android_emulator_launcher.sh b/util/android/android_emulator_launcher.sh index 06cc00a0c73..fe8b164b9b3 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