From 1f60742d1b6c26fa0f2e00a2bb1b5672f6008f2b Mon Sep 17 00:00:00 2001
From: hwsmm <9151706+hwsmm@users.noreply.github.com>
Date: Sun, 29 Jun 2025 19:49:48 +0900
Subject: [PATCH] Add Android target for satellite libraries and include
 Android native libraries

---
 README.md                          | 6 +++---
 SDL3_image-CS/SDL3_image-CS.csproj | 5 +++--
 SDL3_mixer-CS/SDL3_mixer-CS.csproj | 5 +++--
 SDL3_ttf-CS/SDL3_ttf-CS.csproj     | 5 +++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 08c844c..4688190 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ Contributions to keep the bindings up-to-date with upstream changes are welcome.
 | Product         | `win-x64` | `win-x86` | `win-arm64` | `osx-arm64` | `osx-x64` | `linux-x64` | `linux-x86` | `linux-arm64` | `linux-arm` | `ios`   | `android` |
 |-----------------|-----------|-----------|-------------|-------------|-----------|-------------|-------------|---------------|-------------|---------|-----------|
 | `SDL3-CS`       | &check;   | &check;   | &check;     | &check;     | &check;   | &check;     | &check;     | &check;       | &check;     | &check; | &check;   |
-| `SDL3_image-CS` | &check;   | &check;   | &check;     | &check;     | &check;   | &check;     | &check;     | &check;       | &check;     |         |           |
-| `SDL3_ttf-CS`   | &check;   | &check;   | &check;     | &check;     | &check;   | &check;     | &check;     | &check;       | &check;     |         |           |
-| `SDL3_mixer-CS` | &check;   | &check;   | &check;     | &check;     | &check;   | &check;     | &check;     | &check;       | &check;     |         |           |
+| `SDL3_image-CS` | &check;   | &check;   | &check;     | &check;     | &check;   | &check;     | &check;     | &check;       | &check;     |         | &check;   |
+| `SDL3_ttf-CS`   | &check;   | &check;   | &check;     | &check;     | &check;   | &check;     | &check;     | &check;       | &check;     |         | &check;   |
+| `SDL3_mixer-CS` | &check;   | &check;   | &check;     | &check;     | &check;   | &check;     | &check;     | &check;       | &check;     |         | &check;   |
 
 ## Generating bindings
 
diff --git a/SDL3_image-CS/SDL3_image-CS.csproj b/SDL3_image-CS/SDL3_image-CS.csproj
index 53c27d2..382f96d 100644
--- a/SDL3_image-CS/SDL3_image-CS.csproj
+++ b/SDL3_image-CS/SDL3_image-CS.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <RootNamespace>SDL</RootNamespace>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -72,6 +73,7 @@
       <PackagePath>runtimes/ios/native/SDL3.xcframework</PackagePath>
       <Pack>true</Pack>
     </None>
+    -->
     <None Include="$(MSBuildThisFileDirectory)..\native\android\armeabi-v7a\libSDL3_image.so">
       <PackagePath>runtimes/android-arm/native</PackagePath>
       <Pack>true</Pack>
@@ -88,7 +90,6 @@
       <PackagePath>runtimes/android-x86/native</PackagePath>
       <Pack>true</Pack>
     </None>
-    -->
   </ItemGroup>
 
 </Project>
diff --git a/SDL3_mixer-CS/SDL3_mixer-CS.csproj b/SDL3_mixer-CS/SDL3_mixer-CS.csproj
index a7906d7..053fd55 100644
--- a/SDL3_mixer-CS/SDL3_mixer-CS.csproj
+++ b/SDL3_mixer-CS/SDL3_mixer-CS.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <RootNamespace>SDL</RootNamespace>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -72,6 +73,7 @@
       <PackagePath>runtimes/ios/native/SDL3.xcframework</PackagePath>
       <Pack>true</Pack>
     </None>
+    -->
     <None Include="$(MSBuildThisFileDirectory)..\native\android\armeabi-v7a\libSDL3_mixer.so">
       <PackagePath>runtimes/android-arm/native</PackagePath>
       <Pack>true</Pack>
@@ -88,7 +90,6 @@
       <PackagePath>runtimes/android-x86/native</PackagePath>
       <Pack>true</Pack>
     </None>
-    -->
   </ItemGroup>
 
 </Project>
diff --git a/SDL3_ttf-CS/SDL3_ttf-CS.csproj b/SDL3_ttf-CS/SDL3_ttf-CS.csproj
index 3dfa620..2218524 100644
--- a/SDL3_ttf-CS/SDL3_ttf-CS.csproj
+++ b/SDL3_ttf-CS/SDL3_ttf-CS.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <RootNamespace>SDL</RootNamespace>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -72,6 +73,7 @@
       <PackagePath>runtimes/ios/native/SDL3.xcframework</PackagePath>
       <Pack>true</Pack>
     </None>
+    -->
     <None Include="$(MSBuildThisFileDirectory)..\native\android\armeabi-v7a\libSDL3_ttf.so">
       <PackagePath>runtimes/android-arm/native</PackagePath>
       <Pack>true</Pack>
@@ -88,7 +90,6 @@
       <PackagePath>runtimes/android-x86/native</PackagePath>
       <Pack>true</Pack>
     </None>
-    -->
   </ItemGroup>
 
 </Project>