From cc715d9b019f14db058d38e908c745985358f619 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 4 Aug 2022 12:12:10 -0500 Subject: [PATCH] [Xamarin.Android.Tools.AndroidSdk] Permit NDK r25 (#190) Context: https://github.com/xamarin/xamarin-android/issues/7233 Update `AndroidSdkBase.MaximumCompatibleNDKMajorVersion` to 25, so that NDK r25 is considered as a valid version. --- .../Sdks/AndroidSdkBase.cs | 2 +- .../AndroidSdkInfoTests.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs b/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs index 4b04a8b..f00b1a1 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs @@ -11,7 +11,7 @@ abstract class AndroidSdkBase { // When this changes, update the test: Xamarin.Android.Tools.Tests.AndroidSdkInfoTests.Ndk_MultipleNdkVersionsInSdk const int MinimumCompatibleNDKMajorVersion = 16; - const int MaximumCompatibleNDKMajorVersion = 24; + const int MaximumCompatibleNDKMajorVersion = 25; static readonly char[] SourcePropertiesKeyValueSplit = new char[] { '=' }; diff --git a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs index 047ba10..043e89c 100644 --- a/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs +++ b/tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs @@ -71,7 +71,7 @@ public void Ndk_MultipleNdkVersionsInSdk () { // Must match like-named constants in AndroidSdkBase const int MinimumCompatibleNDKMajorVersion = 16; - const int MaximumCompatibleNDKMajorVersion = 24; + const int MaximumCompatibleNDKMajorVersion = 25; CreateSdks(out string root, out string jdk, out string ndk, out string sdk); @@ -94,9 +94,10 @@ public void Ndk_MultipleNdkVersionsInSdk () "22.1.7171670", "23.1.7779620", "24.0.8215888", - "25.0.3735928559", // 0xdeadbeef + "25.0.8775105", + "26.0.3735928559", // 0xdeadbeef }; - string expectedVersion = "24.0.8215888"; + string expectedVersion = "25.0.8775105"; string expectedNdkPath = Path.Combine (sdk, "ndk", expectedVersion); try {