Merge pull request #90 from Susko3/pack-android-libs-in-base-project

Pack Android native libs in `ppy.SDL3-CS`
ppy · May 23, 2024 · bc394a0 · bc394a0
2 parents 33171e6 + 60ecee4
commit bc394a0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git 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
@@ -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>