Fix Android LLVM Bug Causing Crash on x86_64

dotnet/android#1842
TheCodeTraveler · Dec 20, 2021 · 8fb2927 · 8fb2927
1 parent c524afc
commit 8fb2927
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/GitTrends.Android/GitTrends.Android.csproj b/GitTrends.Android/GitTrends.Android.csproj
@@ -47,7 +47,6 @@
     <AotAssemblies>true</AotAssemblies>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
     <AndroidUseAapt2>true</AndroidUseAapt2>
-    <EnableLLVM>true</EnableLLVM>
     <AndroidPackageFormat>aab</AndroidPackageFormat>
     <AndroidTlsProvider>btls</AndroidTlsProvider>
     <AndroidDexTool>d8</AndroidDexTool>
@@ -65,7 +64,6 @@
     <AotAssemblies>true</AotAssemblies>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
     <AndroidUseAapt2>true</AndroidUseAapt2>
-    <EnableLLVM>true</EnableLLVM>
     <AndroidPackageFormat>aab</AndroidPackageFormat>
     <AndroidTlsProvider>btls</AndroidTlsProvider>
     <AndroidDexTool>d8</AndroidDexTool>
@@ -103,6 +101,8 @@
     <PackageReference Include="SkiaSharp.Views.Forms" Version="2.80.3" />
     <PackageReference Include="Refit.Newtonsoft.Json" Version="6.1.15" />
     <PackageReference Include="Shiny.Jobs" Version="2.3.0.2906" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.3.1.4" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.Extensions" Version="2.2.0.10" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/GitTrends.Android/proguard.cfg b/GitTrends.Android/proguard.cfg
@@ -4,6 +4,7 @@
 -dontwarn android.support.**
 # support design
 -dontwarn android.support.design.**
+-keep class androidx.lifecycle.** {*;}
 -keep class android.support.design.** { *; }
 -keep interface android.support.design.** { *; }
 -keep public class android.support.design.R$* { *; }