From 60ecee4eb19512e6303a945fdce6abe9a9d814be Mon Sep 17 00:00:00 2001
From: Susko3 <Susko3@protonmail.com>
Date: Thu, 23 May 2024 22:04:38 +0200
Subject: [PATCH] Pack Android native libs in `ppy.SDL3-CS`

---
 SDL3-CS.Android/SDL3-CS.Android.csproj |  7 -------
 SDL3-CS/SDL3-CS.csproj                 | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/SDL3-CS.Android/SDL3-CS.Android.csproj b/SDL3-CS.Android/SDL3-CS.Android.csproj
index 8d397a9..ec12aaa 100644
--- a/SDL3-CS.Android/SDL3-CS.Android.csproj
+++ b/SDL3-CS.Android/SDL3-CS.Android.csproj
@@ -22,11 +22,4 @@
   <ItemGroup>
     <EmbeddedJar Include="Jars\SDL3AndroidBridge.jar" />
   </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedNativeLibrary Include="..\native\android\armeabi-v7a\libSDL3.so" />
-    <EmbeddedNativeLibrary Include="..\native\android\arm64-v8a\libSDL3.so" />
-    <EmbeddedNativeLibrary Include="..\native\android\x86\libSDL3.so" />
-    <EmbeddedNativeLibrary Include="..\native\android\x86_64\libSDL3.so" />
-  </ItemGroup>
 </Project>
diff --git a/SDL3-CS/SDL3-CS.csproj b/SDL3-CS/SDL3-CS.csproj
index 5e45f05..04e55fd 100644
--- a/SDL3-CS/SDL3-CS.csproj
+++ b/SDL3-CS/SDL3-CS.csproj
@@ -69,6 +69,22 @@
       <PackagePath>runtimes/ios/native</PackagePath>
       <Pack>true</Pack>
     </None>
+    <None Include="$(MSBuildThisFileDirectory)..\native\android\armeabi-v7a\libSDL3.so">
+      <PackagePath>runtimes/android-arm/native</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\native\android\arm64-v8a\libSDL3.so">
+      <PackagePath>runtimes/android-arm64/native</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\native\android\x86_64\libSDL3.so">
+      <PackagePath>runtimes/android-x64/native</PackagePath>
+      <Pack>true</Pack>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\native\android\x86\libSDL3.so">
+      <PackagePath>runtimes/android-x86/native</PackagePath>
+      <Pack>true</Pack>
+    </None>
   </ItemGroup>
 
 </Project>