From 905516cc9c12d2f1311dc919757af0d50c495787 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 21 Jan 2021 11:31:35 +0300 Subject: [PATCH] Freeze NDK 21 on Windows Images (#2499) --- images/win/scripts/Installers/Update-AndroidSDK.ps1 | 4 ++++ images/win/toolsets/toolset-2016.json | 2 +- images/win/toolsets/toolset-2019.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1 index 4c99d1129..0fed426f9 100644 --- a/images/win/scripts/Installers/Update-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Update-AndroidSDK.ps1 @@ -77,6 +77,10 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` # Android NDK root path. $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) { setx ANDROID_HOME $sdkRoot /M diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index c496e7dd1..910687a38 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -163,7 +163,7 @@ "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", - "ndk-bundle", + "ndk;21.3.6528147", "cmdline-tools;latest" ] }, diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index c05a42d29..4214db5d3 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -163,7 +163,7 @@ "cmake;3.6.4111459", "cmake;3.10.2.4988404", "patcher;v4", - "ndk-bundle", + "ndk;21.3.6528147", "cmdline-tools;latest" ] },