Switch more tests to 64-bit ABIs

Author: grendello

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

@@ -229,6 +229,10 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
 		[TestCaseSource (nameof (MonoComponentMaskChecks))]
 		public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, bool debugBuild, uint expectedMask)
 		{
+			if (TargetRuntimeHelper.UseCoreCLR) {
+				Assert.Ignore ("CoreCLR does not support MonoVM components");
+			}
+
 			var proj = new XamarinFormsAndroidApplicationProject () {
 				IsRelease = !debugBuild,
 			};
@@ -271,13 +275,17 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b
 		[NonParallelizable]
 		public void CheckAssemblyCounts (bool isRelease, bool aot)
 		{
+			if (aot && TargetRuntimeHelper.UseCoreCLR) {
+				Assert.Ignore ("CoreCLR doesn't support MonoVM-style AOT");
+			}
+
 			var proj = new XamarinFormsAndroidApplicationProject {
 				IsRelease = isRelease,
 				EmbedAssembliesIntoApk = true,
 				AotAssemblies = aot,
 			};
 
-			var abis = new [] { "armeabi-v7a", "x86" };
+			var abis = new [] { "arm64-v8a", "x86_64" };
 			proj.SetRuntimeIdentifiers (abis);
 			proj.SetProperty (proj.ActiveConfigurationProperties, "AndroidUseAssemblyStore", "True");
 
@@ -1273,7 +1281,7 @@ public void PackageNamingPolicy ([Values ("LowercaseMD5", "LowercaseCrc64")] str
 			var proj = new XamarinAndroidApplicationProject ();
 			proj.SetProperty ("UseInterpreter", "true");
 			proj.SetProperty ("AndroidPackageNamingPolicy", packageNamingPolicy);
-			proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");
+			proj.SetAndroidSupportedAbis ("arm64-v8a", "x86_64");
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "build should have succeeded.");
 				var environment = b.Output.GetIntermediaryPath (Path.Combine ("__environment__.txt"));