[Xamarin.Android.Tools.AndroidSdk] Permit NDK r25 (#190)

jonathanpeppers · web-flow · commit cc715d9b019f · 2022-08-04T17:12:10.000Z
Context: dotnet/android#7233 Update `AndroidSdkBase.MaximumCompatibleNDKMajorVersion` to 25, so that NDK r25 is considered as a valid version.
diff --git 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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ abstract class AndroidSdkBase`
`11`	`11`	`{`
`12`	`12`	`// When this changes, update the test: Xamarin.Android.Tools.Tests.AndroidSdkInfoTests.Ndk_MultipleNdkVersionsInSdk`
`13`	`13`	`const int MinimumCompatibleNDKMajorVersion = 16;`
`14`		`- const int MaximumCompatibleNDKMajorVersion = 24;`
	`14`	`+ const int MaximumCompatibleNDKMajorVersion = 25;`
`15`	`15`
`16`	`16`	`static readonly char[] SourcePropertiesKeyValueSplit = new char[] { '=' };`
`17`	`17`