[Windows] Rework Android NDKs installation (#2555)

* Rework Android NDKs

* Minor fix

* Fix variable name

* Minor fixes

* Reword Android env vars table

* Remove Android env vars table from doc file

* Rework to use only major ndk versions in toolset

* Fix ndk paths

* Fix win2016 toolset

* Refactor

* Minor fix

* Fix ndk tests
This commit is contained in:
Vladimir Safonkin
2021-02-01 12:56:34 +03:00
committed by GitHub
parent 212431cc79
commit fa88926270
5 changed files with 57 additions and 9 deletions

View File

@@ -5,6 +5,9 @@ Describe "Android SDK" {
$androidPackages = Get-AndroidPackages -AndroidSDKManagerPath (Get-AndroidSDKManagerPath)
$androidInstalledPackages = Get-AndroidInstalledPackages
$ndkLTSMajorVersion = $androidToolset.ndk.lts
$ndkLatestMajorVersion = $androidToolset.ndk.latest
$platformTestCases = @()
[int]$platformMinVersion = $androidToolset.platform_min_version
$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
@@ -66,4 +69,12 @@ Describe "Android SDK" {
It "Additional tool <additionalToolVersion> is installed" -TestCases $additionalToolsTestCases {
"$installedPackages" | Should -Match $additionalToolVersion
}
}
It "LTS NDK is installed" -TestCases @(@{ ndkLTSVersion = $ndkLTSMajorVersion; installedPackages = $androidInstalledPackages }) {
"$installedPackages" | Should -Match "ndk;$ndkLTSVersion"
}
It "Latest NDK is installed" -TestCases @(@{ ndkLatestVersion = $ndkLatestMajorVersion; installedPackages = $androidInstalledPackages }) {
"$installedPackages" | Should -Match "ndk;$ndkLatestVersion"
}
}