Another portion of fixes, hopefully

Author: grendello

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

@@ -357,6 +357,11 @@ public static string GetLinkedPath (ProjectBuilder builder, bool isRelease, stri
 		[Test]
 		[TestCaseSource (nameof (RuntimeChecks))]
 		public void CheckWhichRuntimeIsIncluded (string supportedAbi, bool debugSymbols, bool? optimize, bool? embedAssemblies, string expectedRuntime) {
+
+			if (TargetRuntimeHelper.UseCoreCLR && !TargetRuntimeHelper.CoreClrSupportsAllABIs (supportedAbi)) {
+				Assert.Ignore ($"ABI '{supportedAbi}' not supported on CoreCLR");
+			}
+
 			var proj = new XamarinAndroidApplicationProject ();
 			proj.SetAndroidSupportedAbis (supportedAbi);
 			proj.SetProperty (proj.ActiveConfigurationProperties, "DebugSymbols", debugSymbols);

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

@@ -983,6 +983,7 @@ public void CasingOnJavaLangObject ()
 		}
 
 		[Test]
+		[Category ("CoreCLR")]
 		public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
 		{
 			var targets = new [] {
@@ -992,7 +993,7 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
 			};
-			proj.SetAndroidSupportedAbis ("armeabi-v7a");
+			proj.SetAndroidSupportedAbis ("arm64-v8a");
 			proj.OtherBuildItems.Add (new AndroidItem.AndroidEnvironment ("Foo.txt") {
 				TextContent = () => "Foo=Bar",
 			});
@@ -1024,11 +1025,11 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
 		}
 
 		readonly string [] ExpectedAssemblyFiles = new [] {
-			Path.Combine ("android", "environment.armeabi-v7a.o"),
-			Path.Combine ("android", "environment.armeabi-v7a.ll"),
-			Path.Combine ("android", "typemaps.armeabi-v7a.o"),
-			Path.Combine ("android", "typemaps.armeabi-v7a.ll"),
-			Path.Combine ("app_shared_libraries", "armeabi-v7a", "libxamarin-app.so")
+			Path.Combine ("android", "environment.arm64-v8a.o"),
+			Path.Combine ("android", "environment.arm64-v8a.ll"),
+			Path.Combine ("android", "typemaps.arm64-v8a.o"),
+			Path.Combine ("android", "typemaps.arm64-v8a.ll"),
+			Path.Combine ("app_shared_libraries", "arm64-v8a", "libxamarin-app.so")
 		};
 
 		void AssertAssemblyFilesInFileWrites (XamarinAndroidApplicationProject proj, ProjectBuilder b)

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/AssertionExtensions.cs

@@ -129,8 +129,14 @@ public static void AssertEntryContents (this ZipArchive zip, string zipPath, str
 		static void AllowCoreCLRWarning (IEnumerable<string> lastBuildOutput, string logFile)
 		{
 			// With CoreCLR being experimental, we allow a single warning (XA1040)
-			Assert.IsTrue (StringAssertEx.ContainsText (lastBuildOutput, " 1 Warning(s)"), $"{logFile} should have at most 1 MSBuild warning.");
-			Assert.True (StringAssertEx.ContainsText (lastBuildOutput, "XA1040"), "Should receive XA1040 warning");
+			// Library builds won't have warnings, though, so we must account for that too.
+			bool hasNoWarnings = StringAssertEx.ContainsText (lastBuildOutput, " 0 Warning(s)");
+			bool hasOneWarning = StringAssertEx.ContainsText (lastBuildOutput, " 1 Warning(s)");
+
+			Assert.IsTrue (hasNoWarnings || hasOneWarning, $"{logFile} should have at most 1 MSBuild warning.");
+			if (hasOneWarning) {
+				Assert.True (StringAssertEx.ContainsText (lastBuildOutput, "XA1040"), "Should receive XA1040 warning");
+			}
 		}
 
 		[DebuggerHidden]

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/EnvironmentHelper.cs

@@ -534,8 +534,17 @@ static void AssertSharedLibraryHasRequiredSymbols (string dsoPath, string readEl
 				symbols.Add (symbolName);
 			}
 
-			foreach (string symbol in requiredSharedLibrarySymbols) {
-				Assert.IsTrue (symbols.Contains (symbol), $"Symbol '{symbol}' is missing from '{dsoPath}'");
+			if (TargetRuntimeHelper.UseMonoRuntime) {
+				EnsureSymbols (requiredSharedLibrarySymbols);
+			} else if (TargetRuntimeHelper.UseCoreCLR) {
+				EnsureSymbols (requiredSharedLibrarySymbolsCLR);
+			}
+
+			void EnsureSymbols (IEnumerable<string> requiredSymbols)
+			{
+				foreach (string symbol in requiredSymbols) {
+					Assert.IsTrue (symbols.Contains (symbol), $"Symbol '{symbol}' is missing from '{dsoPath}'");
+				}
 			}
 		}