[WIP] Fix more tests

Author: grendello

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs

@@ -212,9 +212,9 @@ public void BuildAotApplicationAndÜmläüts (string supportedAbis, bool enableL
 					// Since we overrode minSdkVersion=16, that means we should use libc.so from android-16.
 					if (ndk22OrNewer) {
 						// NDK r22 or newer store libc in [toolchain]/sysroot/usr/lib/[ARCH]/[API]/libc.so
-						StringAssertEx.ContainsRegex (@"\s*\[aot-compiler stdout].*sysroot.*.usr.lib.*16.libc\.so", b.LastBuildOutput, "AOT+LLVM should use libc.so from minSdkVersion!");
+						StringAssertEx.ContainsRegex (@"\s*\[aot-compiler stdout].*sysroot.*.usr.lib.*19.libc\.so", b.LastBuildOutput, "AOT+LLVM should use libc.so from minSdkVersion!");
 					} else {
-						StringAssertEx.ContainsRegex (@"\s*\[aot-compiler stdout].*android-16.arch-.*.usr.lib.libc\.so", b.LastBuildOutput, "AOT+LLVM should use libc.so from minSdkVersion!");
+						StringAssertEx.ContainsRegex (@"\s*\[aot-compiler stdout].*android-19.arch-.*.usr.lib.libc\.so", b.LastBuildOutput, "AOT+LLVM should use libc.so from minSdkVersion!");
 					}
 				}
 				foreach (var abi in supportedAbis.Split (new char [] { ';' })) {

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/MakeBundleTests.cs

@@ -159,7 +159,7 @@ void CheckBundleForSoname (ZipArchive zip, string bundlePath)
 			string sonameField;
 
 			if (elfReaderLlvm) {
-				arguments = "-dynamic-table";
+				arguments = "--dynamic-table";
 				sonameField = "SONAME";
 			} else {
 				arguments = "-d";

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using NUnit.Framework;
 using Xamarin.ProjectTools;
@@ -440,7 +440,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{versionCode:000}",
 				/* props */ null,
 				/* shouldBuild */ true,
-				/* expected */ "216012;316012",
+				/* expected */ "219012;316012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -450,7 +450,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{screen}{versionCode:000}",
 				/* props */ "screen=24",
 				/* shouldBuild */ true,
-				/* expected */ "21624012;31624012",
+				/* expected */ "21924012;31624012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -460,7 +460,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{screen}{foo:0}{versionCode:000}",
 				/* props */ "screen=24;foo=$(Foo)",
 				/* shouldBuild */ true,
-				/* expected */ "216241012;316241012",
+				/* expected */ "219241012;316241012",
 			},
 			new object[] {
 				/* seperateApk */ true,
@@ -470,7 +470,7 @@ public void DirectBootAwareAttribute ()
 				/* pattern */ "{abi}{minSDK:00}{screen}{foo:00}{versionCode:000}",
 				/* props */ "screen=24;foo=$(Foo)",
 				/* shouldBuild */ false,
-				/* expected */ "2162401012;3162401012",
+				/* expected */ "2192401012;3162401012",
 			},
 		};
 

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/NdkUtilTests.cs

@@ -42,7 +42,7 @@ public void TestNdkUtil ()
 				Assert.IsTrue (ndk.ValidateNdkPlatform (arch, enableLLVM: false));
 				Assert.AreEqual (0, errors.Count, "NdkTools.ValidateNdkPlatform should not have returned false.");
 				int level = ndk.GetMinimumApiLevelFor (arch);
-				int expected = 16;
+				int expected = 19;
 				Assert.AreEqual (expected, level, $"Min Api Level for {arch} should be {expected}.");
 				var compilerNoQuotes = ndk.GetToolPath (NdkToolKind.CompilerC, arch, level);
 				Assert.AreEqual (0, errors.Count, "NdkTools.GetToolPath should not have errored.");