Merge pull request #128 from smoogipoo/fix-android-tests

Fix android tests
ppy · Aug 7, 2024 · b8b1aa1 · b8b1aa1
2 parents 26865ce + d260e73
commit b8b1aa1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git 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();
     }
 }
diff --git 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>