Bump to xamarin/monodroid@9b3a37af (#6405)

jonathanpeppers · web-flow · commit 1ab4f23e2c73 · 2021-10-22T16:06:49.000-04:00
Context: #6353 Changes: xamarin/monodroid@07a99d7...9b3a37a * xamarin/monodroid@9b3a37af1: [tools/msbuild] <GetPrimaryCpuAbi/> should not select 32-bit ABIs (#1228) Update `MonoAndroidExportTest.MonoAndroidExportReferencedAppStarts()` under .NET 6 to add `x86_64`, e.g. `$(AndroidSupportedAbis)`=`armeabi-v7a;x86;x86_64`. This is needed because the API-31 emulator only supports x86_64, not x86.
diff --git a/.external b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@07a99d799289e90870243312ffd16f9e3187ec52
+xamarin/monodroid:main@9b3a37af1102f56ccaf449864f18a7d2a78e9682
 mono/mono:2020-02@c633fe923832f0c3db3c4e6aa98e5592bf5a06e7
diff --git a/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs b/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs
@@ -104,7 +104,7 @@ protected override void OnCreate (Bundle bundle)
 			}
 		}
 	}";
-			proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");
+			proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86", "x86_64");
 			proj.SetProperty ("EmbedAssembliesIntoApk", embedAssemblies.ToString ());
 			proj.SetDefaultTargetDevice ();
 			using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-xamarin/monodroid:main@07a99d799289e90870243312ffd16f9e3187ec52`
	`1`	`+xamarin/monodroid:main@9b3a37af1102f56ccaf449864f18a7d2a78e9682`
`2`	`2`	`mono/mono:2020-02@c633fe923832f0c3db3c4e6aa98e5592bf5a06e7`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ protected override void OnCreate (Bundle bundle)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}";`
`107`		`- proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");`
	`107`	`+ proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86", "x86_64");`
`108`	`108`	`proj.SetProperty ("EmbedAssembliesIntoApk", embedAssemblies.ToString ());`
`109`	`109`	`proj.SetDefaultTargetDevice ();`
`110`	`110`	`using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {`