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

CMake: use ANDROID_SDK_ROOT instead of ANDROID_SDK consistently

Browse Source 
Make the use of ANDROID_SDK_ROOT consistent.

Task-number: QTCREATORBUG-24678
Change-Id: If967bdc4d252996098fa210cf38429fe075eacb1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Assam Boudjelthia 2020-09-23 19:12:51 +03:00
parent 5a158a9512
commit 45896797c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPlatformAndroid.cmake
View File

@ -79,7 +79,7 @@ if (NOT QT_ANDROID_SDK_BUILD_TOOLS_VERSION)
RELATIVE "${ANDROID_SDK_ROOT}/build-tools" RELATIVE "${ANDROID_SDK_ROOT}/build-tools"
"${ANDROID_SDK_ROOT}/build-tools/*") "${ANDROID_SDK_ROOT}/build-tools/*")
if (NOT android_build_tools) if (NOT android_build_tools)
message(FATAL_ERROR "Could not locate Android SDK build tools under \"${ANDROID_SDK}/build-tools\"") message(FATAL_ERROR "Could not locate Android SDK build tools under \"${ANDROID_SDK_ROOT}/build-tools\"")
endif() endif()
list(SORT android_build_tools) list(SORT android_build_tools)
list(REVERSE android_build_tools) list(REVERSE android_build_tools)