Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jonathanpeppers committed Oct 22, 2021
1 parent 767150d commit 27295e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:main@07a99d799289e90870243312ffd16f9e3187ec52
xamarin/monodroid:main@9b3a37af1102f56ccaf449864f18a7d2a78e9682
mono/mono:2020-02@c633fe923832f0c3db3c4e6aa98e5592bf5a06e7
Original file line number Diff line number Diff line change
Expand Up @@ -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))) {
Expand Down

0 comments on commit 27295e2

Please sign in to comment.