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

Rename deprecated ANDROID_SDK_HOME to ANDROID_SDK_ROOT

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia 2021-10-18 12:51:06 +03:00 committed by Qt Cherry-pick Bot
parent 90ee5721b4
commit 9a122f39ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/android/android_emulator_launcher.sh
View File

@ -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