diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-10-18 10:17:32 +0300 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2021-10-22 09:14:29 +0200 |
| commit | d59825d250c0570f4c26da6908b471ccdd0faf01 (patch) | |
| tree | 1dbc3fffe8be1b905cd9a89e726aad885f6b24ae /coin/provisioning/common/windows/android.ps1 | |
| parent | 6af22246cf3752f1d098a9e8a19617618edf65a2 (diff) | |
Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.
Pick-to: 6.2
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>
Diffstat (limited to 'coin/provisioning/common/windows/android.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/android.ps1 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 82c7ee50..8ab06d82 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -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) { |