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

Freeze NDK 21 on Windows Images (#2499)

Browse Source
This commit is contained in:
Dmitry Shibanov
2021-01-21 11:31:35 +03:00
committed by GitHub
parent c3525f6978
commit 905516cc9c
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/win/scripts/Installers/Update-AndroidSDK.ps1
View File

@@ -77,6 +77,10 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `
# Android NDK root path. # Android NDK root path.
$ndkRoot = "$sdkRoot\ndk-bundle" $ndkRoot = "$sdkRoot\ndk-bundle"
# This changes were added due to incompatibility with android ndk-bundle (ndk;22.0.7026061).
# 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\21.3.6528147"
if (Test-Path $ndkRoot) { if (Test-Path $ndkRoot) {
setx ANDROID_HOME $sdkRoot /M setx ANDROID_HOME $sdkRoot /M

2
images/win/toolsets/toolset-2016.json
View File

@@ -163,7 +163,7 @@
"cmake;3.6.4111459", "cmake;3.6.4111459",
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"patcher;v4", "patcher;v4",
"ndk-bundle", "ndk;21.3.6528147",
"cmdline-tools;latest" "cmdline-tools;latest"
] ]
}, },

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

@@ -163,7 +163,7 @@
"cmake;3.6.4111459", "cmake;3.6.4111459",
"cmake;3.10.2.4988404", "cmake;3.10.2.4988404",
"patcher;v4", "patcher;v4",
"ndk-bundle", "ndk;21.3.6528147",
"cmdline-tools;latest" "cmdline-tools;latest"
] ]
}, },