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

[Windows] Remove ndk-bundle (#5927)

Browse Source 
* Remove ndk-bundle from windows

* Remove NDK-related variables
This commit is contained in:
Mikhail Timofeev
2022-07-21 11:33:38 +04:00
committed by GitHub
parent 593ab19a0f
commit a41909d0c5
5 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
images/win/scripts/Installers/Install-AndroidSDK.ps1
View File

@@ -109,7 +109,6 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `
# NDKs # NDKs
$ndkMajorVersions = $androidToolset.ndk.versions $ndkMajorVersions = $androidToolset.ndk.versions
$ndkDefaultMajorVersion = $androidToolset.ndk.default
$ndkLatestMajorVersion = $ndkMajorVersions | Select-Object -Last 1 $ndkLatestMajorVersion = $ndkMajorVersions | Select-Object -Last 1
$androidNDKs = $ndkMajorVersions | Foreach-Object { $androidNDKs = $ndkMajorVersions | Foreach-Object {
@@ -120,27 +119,11 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `
-AndroidSDKRootPath $sdkRoot ` -AndroidSDKRootPath $sdkRoot `
-AndroidPackages $androidNDKs -AndroidPackages $androidNDKs
$ndkDefaultVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkDefaultMajorVersion" }).Split(';')[1]
$ndkLatestVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkLatestMajorVersion" }).Split(';')[1] $ndkLatestVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkLatestMajorVersion" }).Split(';')[1]
# Android NDK root path. # Create env variables
$ndkRoot = "$sdkRoot\ndk-bundle" setx ANDROID_HOME $sdkRoot /M
# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061). setx ANDROID_SDK_ROOT $sdkRoot /M
# Link issue virtual-environments: https://github.com/actions/virtual-environments/issues/2481
# Link issue xamarin-android: https://github.com/xamarin/xamarin-android/issues/5526
New-Item -Path $ndkRoot -ItemType SymbolicLink -Value "$sdkRoot\ndk\$ndkDefaultVersion"
if (Test-Path $ndkRoot) {
setx ANDROID_HOME $sdkRoot /M
setx ANDROID_SDK_ROOT $sdkRoot /M
setx ANDROID_NDK_HOME $ndkRoot /M
setx ANDROID_NDK_PATH $ndkRoot /M
setx ANDROID_NDK_ROOT $ndkRoot /M
(Get-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd").replace('%~dp0\build\ndk-build.cmd','"%~dp0\build\ndk-build.cmd"')|Set-Content -Encoding UTF8 "${ndkRoot}\ndk-build.cmd"
} else {
Write-Host "Default NDK $ndkDefaultVersion is not installed at path $ndkRoot"
exit 1
}
$ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" $ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion"
if (Test-Path $ndkLatestPath) { if (Test-Path $ndkLatestPath) {

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

@@ -164,23 +164,16 @@ function Get-AndroidNdkVersions {
[object] $PackageInfo [object] $PackageInfo
) )
$ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target
$ndkDefaultFullVersion = Split-Path -Path $ndkLinkTarget -Leaf
$versions = $packageInfo | Where-Object { $_ -Match "ndk;" } | ForEach-Object { $versions = $packageInfo | Where-Object { $_ -Match "ndk;" } | ForEach-Object {
$version = (Split-TableRowByColumns $_)[1] (Split-TableRowByColumns $_)[1]
if ($version -eq $ndkDefaultFullVersion) {
$version += " (default)"
}
$version
} }
return ($versions -Join "<br>") return ($versions -Join "<br>")
} }
function Build-AndroidEnvironmentTable { 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 { return $androidVersions | Sort-Object -Property Name | ForEach-Object {
[PSCustomObject] @{ [PSCustomObject] @{
"Name" = $_.Name "Name" = $_.Name

6
images/win/scripts/Tests/Android.Tests.ps1
View File

@@ -96,11 +96,5 @@ Describe "Android SDK" {
It "NDK <ndkPackage> is installed" -TestCases $ndkPackagesTestCases { It "NDK <ndkPackage> is installed" -TestCases $ndkPackagesTestCases {
"$installedPackages" | Should -Match "ndk;$ndkPackage" "$installedPackages" | Should -Match "ndk;$ndkPackage"
} }
It "ndk-bundle points to the default NDK version" -TestCases @{ ndkDefaultVersion = $ndkDefaultFullVersion } {
$ndkLinkTarget = (Get-Item $env:ANDROID_NDK_HOME).Target
$ndkVersion = Split-Path -Path $ndkLinkTarget -Leaf
$ndkVersion | Should -BeExactly $ndkDefaultVersion
}
} }
} }

1
images/win/toolsets/toolset-2019.json
View File

@@ -183,7 +183,6 @@
"patcher;v4" "patcher;v4"
], ],
"ndk": { "ndk": {
"default": "23",
"versions": [ "versions": [
"21", "23", "24" "21", "23", "24"
] ]

1
images/win/toolsets/toolset-2022.json
View File

@@ -153,7 +153,6 @@
"patcher;v4" "patcher;v4"
], ],
"ndk": { "ndk": {
"default": "23",
"versions": [ "versions": [
"21", "23", "24" "21", "23", "24"
] ]