From eaacf5279e4066b3f9763eda243607cd6a62bb19 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 7 Aug 2024 22:16:40 +0900
Subject: [PATCH 1/2] Fix android tests

---
 SDL3-CS.Tests.Android/MainActivity.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/SDL3-CS.Tests.Android/MainActivity.cs b/SDL3-CS.Tests.Android/MainActivity.cs
index 258529d..12d62f6 100644
--- a/SDL3-CS.Tests.Android/MainActivity.cs
+++ b/SDL3-CS.Tests.Android/MainActivity.cs
@@ -1,5 +1,4 @@
-using Java.Lang;
-using Org.Libsdl.App;
+using Org.Libsdl.App;
 
 namespace SDL.Tests.Android
 {
@@ -8,6 +7,6 @@ public class MainActivity : SDLActivity
     {
         protected override string[] GetLibraries() => ["SDL3"];
 
-        protected override IRunnable CreateSDLMainRunnable() => new Runnable(Program.Main);
+        protected override void Main() => Program.Main();
     }
 }

From d260e738b13b91bc7f010e89520dfcefc5a597f3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 7 Aug 2024 22:46:16 +0900
Subject: [PATCH 2/2] Fix native lib packaging in android tests project

---
 .../SDL3-CS.Tests.Android.csproj                  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj b/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj
index 4ce67fa..e84e625 100644
--- a/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj
+++ b/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj
@@ -16,4 +16,19 @@
     <ProjectReference Include="..\SDL3-CS.Android\SDL3-CS.Android.csproj"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\native\android\armeabi-v7a\libSDL3.so">
+      <Abi>armeabi-v7a</Abi>
+    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\native\android\arm64-v8a\libSDL3.so">
+      <Abi>arm64-v8a</Abi>
+    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\native\android\x86\libSDL3.so">
+      <Abi>x86</Abi>
+    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\native\android\x86_64\libSDL3.so">
+      <Abi>x86_64</Abi>
+    </AndroidNativeLibrary>
+  </ItemGroup>
+
 </Project>