Add a way to disable the error

Author: brendanzagaeski

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

@@ -298,8 +298,32 @@ public static void Foo () {
 			sb.Dispose ();
 		}
 
+		static readonly object [] HybridAOTSource = new object [] {
+			new object [] {
+				/* abis */                       "armeabi-v7a;arm64-v8a",
+				/* validateAbi */                null,
+				/* expectedBuildResult */        false
+			},
+			new object [] {
+				/* abis */                       "armeabi-v7a",
+				/* validateAbi */                null,
+				/* expectedBuildResult */        false
+			},
+			new object [] {
+				/* abis */                       "arm64-v8a",
+				/* validateAbi */                null,
+				/* expectedBuildResult */        true
+			},
+			new object [] {
+				/* abis */                       "armeabi-v7a;arm64-v8a",
+				/* validateAbi */                "false",
+				/* expectedBuildResult */        true
+			}
+		};
+
 		[Test]
-		public void HybridAOT ([Values ("armeabi-v7a;arm64-v8a", "armeabi-v7a", "arm64-v8a")] string abis)
+		[TestCaseSource (nameof (HybridAOTSource))]
+		public void HybridAOT (string abis, string validateAbi, bool expectedBuildResult)
 		{
 			var proj = new XamarinAndroidApplicationProject () {
 				IsRelease = true,
@@ -309,10 +333,11 @@ public static void Foo () {
 			// So we can use Mono.Cecil to open assemblies directly
 			proj.SetProperty ("AndroidEnableAssemblyCompression", "False");
 			proj.SetAndroidSupportedAbis (abis);
+			proj.SetProperty ("AndroidAotModeValidateAbi", validateAbi);
 
 			using (var b = CreateApkBuilder ()) {
 
-				if (abis.Contains ("armeabi-v7a")) {
+				if (!expectedBuildResult) {
 					b.ThrowOnBuildFailure = false;
 					Assert.IsFalse (b.Build (proj), "Build should have failed.");
 					string error = b.LastBuildOutput

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

@@ -2166,7 +2166,7 @@ because xbuild doesn't support framework reference assemblies.
   />
   <AndroidError Code="XA1025"
       ResourceName="XA1025"
-      Condition=" '%(_BuildTargetAbis.Identity)' == 'armeabi-v7a' AND '$(AndroidAotMode)' == 'Hybrid' " />
+      Condition=" '$(AndroidAotModeValidateAbi)' != 'false' AND '%(_BuildTargetAbis.Identity)' == 'armeabi-v7a' AND '$(AndroidAotMode)' == 'Hybrid' " />
 </Target>
 
 <PropertyGroup>