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

Add ndk-related environment variables to windows (#5985)

Browse Source
This commit is contained in:
Mikhail Timofeev
2022-07-29 13:08:30 +04:00
committed by GitHub
parent 1c6ef2dda5
commit 77dfaa7c15
4 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1
View File

@@ -164,8 +164,14 @@ function Get-AndroidNdkVersions {
[object] $PackageInfo
)
$ndkDefaultFullVersion = Get-ChildItem $env:ANDROID_NDK_HOME -Name
$versions = $packageInfo | Where-Object { $_ -Match "ndk;" } | ForEach-Object {
(Split-TableRowByColumns $_)[1]
$version = (Split-TableRowByColumns $_)[1]
if ($version -eq $ndkDefaultFullVersion) {
$version += " (default)"
}
$version
}
return ($versions -Join "<br>")
}
@@ -173,7 +179,7 @@ function Get-AndroidNdkVersions {
function Build-AndroidEnvironmentTable {
$androidVersions = Get-Item env:ANDROID_*
$shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME'
$shoulddResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME'
return $androidVersions | Sort-Object -Property Name | ForEach-Object {
[PSCustomObject] @{
"Name" = $_.Name