diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-18 12:51:06 +0300 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2021-10-22 17:21:10 +0200 |
| commit | a81f24ada5cb125b2f19dc399b2c51dc7cd6ac99 (patch) | |
| tree | 73212e41863284567c1b0cd59ce296bf9bf33465 /util | |
| parent | 7c7184ad60688437dbc2d82e9ecd37d1b9e3638b (diff) | |
Rename deprecated ANDROID_SDK_HOME to ANDROID_SDK_ROOT
Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: I777491f542e5388e04ed4c1b7ff5d9db75f9e778
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
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 |