Allow MaximumCompatibleNDKMajorVersion=28 (#263)

jonathanpeppers · web-flow · commit 87226632ff5e · 2025-10-15T12:43:21.000-05:00
Context: dotnet/android@80559b5 We are already using the 28.x Android NDK, so we should allow it here. I also updated a unit test that was outdated.
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 = 26;
+		const int MaximumCompatibleNDKMajorVersion = 28;
 
 		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 = 25;
+			const int MaximumCompatibleNDKMajorVersion = 28;
 
 			CreateSdks(out string root, out string jdk, out string ndk, out string sdk);
 
@@ -95,9 +95,12 @@ public void Ndk_MultipleNdkVersionsInSdk ()
 				"23.1.7779620",
 				"24.0.8215888",
 				"25.0.8775105",
-				"26.0.3735928559",   // 0xdeadbeef
+				"26.0.10792818",
+				"27.0.11718014",
+				"28.0.12433566",
+				"29.0.3735928559",   // 0xdeadbeef
 			};
-			string expectedVersion = "25.0.8775105";
+			string expectedVersion = ndkVersions [^2]; // Second to last is the highest compatible version
 			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 = 26;`
	`14`	`+ const int MaximumCompatibleNDKMajorVersion = 28;`
`15`	`15`
`16`	`16`	`static readonly char[] SourcePropertiesKeyValueSplit = new char[] { '=' };`
`17`	`17`