From a34e03d7f5ee0a67b00ddf8f2dac4d42a497df58 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 3 Jun 2022 19:12:12 -0400
Subject: [PATCH 1/2] Fix android service initialization order

---
 src/Android/Avalonia.Android/AndroidPlatform.cs  | 2 --
 src/Android/Avalonia.Android/AvaloniaActivity.cs | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs
index 61aa6ce946..c7dd896cb8 100644
--- a/src/Android/Avalonia.Android/AndroidPlatform.cs
+++ b/src/Android/Avalonia.Android/AndroidPlatform.cs
@@ -61,8 +61,6 @@ namespace Avalonia.Android
                 .Bind<IRenderLoop>().ToConstant(new RenderLoop())
                 .Bind<PlatformHotkeyConfiguration>().ToSingleton<PlatformHotkeyConfiguration>();
 
-            SkiaPlatform.Initialize();
-
             if (options.UseGpu)
             {
                 EglPlatformOpenGlInterface.TryInitialize();
diff --git a/src/Android/Avalonia.Android/AvaloniaActivity.cs b/src/Android/Avalonia.Android/AvaloniaActivity.cs
index f5d620a97a..f3692d33d7 100644
--- a/src/Android/Avalonia.Android/AvaloniaActivity.cs
+++ b/src/Android/Avalonia.Android/AvaloniaActivity.cs
@@ -31,21 +31,22 @@ namespace Avalonia.Android
             
             CustomizeAppBuilder(builder);
 
-            View = new AvaloniaView(this);
-            SetContentView(View);
 
             var lifetime = new SingleViewLifetime();
-            lifetime.View = View;
 
             builder.AfterSetup(x =>
             {
                 _viewModel = new ViewModelProvider(this).Get(Java.Lang.Class.FromType(typeof(AvaloniaViewModel))) as AvaloniaViewModel;
 
+                View = new AvaloniaView(this);
                 if (_viewModel.Content != null)
                 {
                     View.Content = _viewModel.Content;
                 }
 
+                SetContentView(View);
+                lifetime.View = View;
+
                 View.Prepare();
             });
 

From b277db43bd88c860ff998796570fd5540a8b4342 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 3 Jun 2022 21:02:09 -0400
Subject: [PATCH 2/2] Update release build parameters

---
 .../ControlCatalog.Android/ControlCatalog.Android.csproj   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 04c67e84e8..ec88852feb 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -20,10 +20,13 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''">
-    <DebugSymbols>True</DebugSymbols>
+    <DebugSymbols>False</DebugSymbols>
+    <UseInterpreter>False</UseInterpreter>
     <RunAOTCompilation>True</RunAOTCompilation>
     <EnableLLVM>True</EnableLLVM>
-    <AndroidEnableProfiledAot>True</AndroidEnableProfiledAot>
+    <AndroidAotAdditionalArguments>no-write-symbols,nodebug</AndroidAotAdditionalArguments>
+    <AndroidAotMode>Hybrid</AndroidAotMode>
+    <AndroidGenerateJniMarshalMethods>True</AndroidGenerateJniMarshalMethods>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">