[macOS] Fix ndk output in readme for Big Sur (#2597)

* Fix condition

* Remove ndk-bundle retrieval from packages list

* remove unnecessary packageinfo param

* simplify function

* move $versions definition
This commit is contained in:
Mikhail Timofeev
2021-02-02 11:19:20 +03:00
committed by GitHub
parent 43b2ebbb96
commit 19201a0735

View File

@@ -84,7 +84,7 @@ function Build-AndroidTable {
},
@{
"Package" = "NDK"
"Version" = Get-AndroidNDKVersions -PackageInfo $packageInfo
"Version" = Get-AndroidNDKVersions
},
@{
"Package" = "SDK Patch Applier v4"
@@ -161,28 +161,16 @@ function Get-AndroidGoogleAPIsVersions {
}
function Get-AndroidNDKVersions {
param (
[Parameter(Mandatory)][AllowEmptyString()]
[string[]] $packageInfo
)
$os = Get-OSVersion
$versions = @()
if ($os.IsLessThanBigSur) {
# Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location)
$versions = @()
$versions += "15.2.4203891"
$ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
Get-ChildItem -Path $ndkFolderPath | ForEach-Object {
$versions += $_.Name
}
}
$versions += $packageInfo | Where-Object { $_ -Match "ndk-bundle" } | ForEach-Object {
$packageInfoParts = Split-TableRowByColumns $_
return $packageInfoParts[1]
}
$ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
$versions += Get-ChildItem -Path $ndkFolderPath -Name
return ($versions -Join "<br>")
}