lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-01 08:57:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Coin:Android: set ANDROID_SDK_ROOT explicitly

Browse Source 
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d59825d250)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-10-18 10:17:32 +03:00
parent 91c20d709a
commit f4903d61e8
11 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/provisioning/common/windows/android.ps1
View File

@@ -73,13 +73,12 @@ function Install($1, $2, $3, $4) {
Write-Host "Installing Android NDK $nkdVersion"
Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder
Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
New-Item -ItemType directory -Path $toolsFolder
Move-Item -Path C:\Utils\Android\tools -Destination $toolsFolder\
Set-EnvironmentVariable "ANDROID_SDK_HOME" "C:\Utils\Android"
Set-EnvironmentVariable "ANDROID_SDK_ROOT" "C:\Utils\Android"
Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel
if (IsProxyEnabled) {