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

Remove ndk-bundle + old ndk versions from macOS (#5929)

Browse Source
This commit is contained in:
Mikhail Timofeev
2022-07-21 11:33:26 +04:00
committed by GitHub
parent ef8f8086d5
commit 593ab19a0f
10 changed files with 6 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,13 +94,13 @@ function Build-AndroidTable {
}
function Build-AndroidEnvironmentTable {
$androidVersions = Get-Item env:ANDROID_*
$androidVersions = Get-Item env:ANDROID_*
$shoulddResolveLink = 'ANDROID_NDK_PATH', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME'
$shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME'
return $androidVersions | Sort-Object -Property Name | ForEach-Object {
[PSCustomObject] @{
"Name" = $_.Name
"Value" = if ($shoulddResolveLink.Contains($_.Name )) { Get-PathWithLink($_.Value) } else {$_.Value}
"Value" = if ($shoulddResolveLink.Contains($_.Name )) { Get-PathWithLink($_.Value) } else { $_.Value }
}
}
}
@@ -175,23 +175,9 @@ function Get-AndroidGoogleAPIsVersions {
}
function Get-AndroidNDKVersions {
$os = Get-OSVersion
if ($os.IsCatalina) {
# 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"
$versions += Get-ChildItem -Path $ndkFolderPath -Name
$ndkDefaultVersion = Get-ToolsetValue "android.ndk.default"
$ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1
return ($versions | ForEach-Object {
$defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : ""
$_ + $defaultPostfix
} | Join-String -Separator "<br>")
return ($versions | Join-String -Separator "<br>")
}
function Get-IntelHaxmVersion {