actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-19 08:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

added Get-AndroidNDKVersions function

Browse Source
This commit is contained in:
Nikita Bykov
2020-09-22 09:46:44 +03:00
parent c7b8aca60e
commit c3ca91a185
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
images/macos/software-report/SoftwareReport.Android.psm1
View File

@@ -32,7 +32,6 @@ function Get-AndroidInstalledPackages {
function Build-AndroidTable { function Build-AndroidTable {
Write-Host "Build-AndroidTable" Write-Host "Build-AndroidTable"
$packageInfo = Get-AndroidInstalledPackages $packageInfo = Get-AndroidInstalledPackages
Write-Host $packageInfo
return @( return @(
@{ @{
"Package" = "Android SDK Tools" "Package" = "Android SDK Tools"
@@ -76,7 +75,7 @@ function Build-AndroidTable {
}, },
@{ @{
"Package" = "NDK" "Package" = "NDK"
"Version" = Build-AndroidNDKTable -PackageInfo $packageInfo "Version" = Get-AndroidNDKVersions -PackageInfo $packageInfo
} }
) | Where-Object { $_.Version } | ForEach-Object { ) | Where-Object { $_.Version } | ForEach-Object {
[PSCustomObject] @{ [PSCustomObject] @{
@@ -148,27 +147,29 @@ function Get-AndroidGoogleAPIsVersions {
return ($versions -Join "<br>") return ($versions -Join "<br>")
} }
function Build-AndroidNDKTable { function Get-AndroidNDKVersions {
param ( param (
[Parameter(Mandatory)][AllowEmptyString()] [Parameter(Mandatory)][AllowEmptyString()]
[string[]] $installedPackages [string[]] $packageInfo
) )
$os = Get-OSVersion
$versions = @()
if ($os.IsLessThanBigSur) { if ($os.IsLessThanBigSur) {
# Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location) # Hardcode NDK 15 as a separate case since it is installed manually without sdk-manager (to none default location)
$versions = "15.2.4203891" $versions += "15.2.4203891"
$ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk"
$versions += Get-ChildItem -Path $ndkFolderPath | ForEach-Object Get-ChildItem -Path $ndkFolderPath | ForEach-Object {
$versions += $_.Name
}
} }
$ndkBundleInfo = $installedPackages | Where-Object { $_ -Match "ndk-bundle" } | Select-Object -First 1 $versions += $packageInfo | Where-Object { $_ -Match "ndk-bundle" } | ForEach-Object {
$ndkBundleVersion = (Split-TableRowByColumns $ndkBundleInfo)[1] $packageInfoParts = Split-TableRowByColumns $_
$ndkInfo += $ndkBundleVersion return $packageInfoParts[1]
}
# $ndkInfo | ForEach-Object { return ($versions -Join "<br>")
# $_.Path = $_.Path.Replace($env:HOME, '$HOME')
# }
return $ndkInfo
} }