From f59e862f406751321479c9c4115fe6bc2e299345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20L=C3=B3pez?= <jesuslpm@hotmail.com>
Date: Thu, 8 May 2025 13:28:33 +0100
Subject: [PATCH] Add Android binaries to NuGet package (#1455)

Add android binaries to NuGet package
---
 .github/workflows/dotnet-core.yml       | 50 +++++++++++++++++++++++++
 packaging/dotnet-core/libsodium.pkgproj |  4 ++
 2 files changed, 54 insertions(+)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index b24f68df..84242232 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -42,6 +42,38 @@ jobs:
           version: master
       - uses: actions/checkout@v4
 
+      - name: Build Android AAR
+        run: sh ./dist-build/android-aar.sh
+
+      - name: Extract android AAR file
+        run: |
+          mkdir -p extracted-aar
+          unzip libsodium-*.aar -d extracted-aar
+            
+      - name: Upload Android arm64
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-android-arm64
+          path: extracted-aar/prefab/modules/sodium/libs/android.arm64-v8a/libsodium.so
+        
+      - name: Upload Android arm
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-android-arm
+          path: extracted-aar/prefab/modules/sodium/libs/android.armeabi-v7a/libsodium.so
+      
+      - name: Upload Android x64
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-android-x64
+          path: extracted-aar/prefab/modules/sodium/libs/android.x86_64/libsodium.so
+      
+      - name: Upload Android x86
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-android-x86
+          path: extracted-aar/prefab/modules/sodium/libs/android.x86/libsodium.so
+
       - name: build-linux-x64
         run: |
           rm -fr zig-out .zig-cache; zig build -Doptimize=ReleaseFast -Dtarget=x86_64-linux-gnu.2.17
@@ -212,9 +244,26 @@ jobs:
         with:
           name: build-maccatalyst
           path: .libsodium-pack/runtimes/maccatalyst-arm64/native/
+      - uses: actions/download-artifact@v4
+        with:
+          name: build-android-arm64
+          path: .libsodium-pack/runtimes/android-arm64/native/
+      - uses: actions/download-artifact@v4
+        with:
+          name: build-android-arm
+          path: .libsodium-pack/runtimes/android-arm/native/
+      - uses: actions/download-artifact@v4
+        with:
+          name: build-android-x64
+          path: .libsodium-pack/runtimes/android-x64/native/
+      - uses: actions/download-artifact@v4
+        with:
+          name: build-android-x86
+          path: .libsodium-pack/runtimes/android-x86/native/
 
       - name: Copy files
         run: cp AUTHORS ChangeLog LICENSE packaging/dotnet-core/libsodium.pkgproj .libsodium-pack/
+
       - name: Create NuGet package
         run: dotnet pack -c Release .libsodium-pack/libsodium.pkgproj
       - uses: actions/upload-artifact@v4
@@ -245,6 +294,7 @@ jobs:
           path: .libsodium-pack/
       - name: dotnet new
         run: dotnet new console -n Tests -o .libsodium-test/
+
       - name: dotnet add package libsodium
         run: dotnet add .libsodium-test/Tests.csproj package libsodium -s $PWD/.libsodium-pack
       - name: Copy files
diff --git a/packaging/dotnet-core/libsodium.pkgproj b/packaging/dotnet-core/libsodium.pkgproj
index 9a4b4162..6e671972 100644
--- a/packaging/dotnet-core/libsodium.pkgproj
+++ b/packaging/dotnet-core/libsodium.pkgproj
@@ -40,6 +40,10 @@
     <Content Include="runtimes/tvos-arm64/native/libsodium.a" PackagePath="runtimes/tvos-arm64/native/" />
     <Content Include="runtimes/maccatalyst-x64/native/libsodium.a" PackagePath="runtimes/maccatalyst-x64/native/" />
     <Content Include="runtimes/maccatalyst-arm64/native/libsodium.a" PackagePath="runtimes/maccatalyst-arm64/native/" />
+    <Content Include="runtimes/android-arm64/native/libsodium.so" PackagePath="runtimes/android-arm64/native/" />
+    <Content Include="runtimes/android-arm/native/libsodium.so" PackagePath="runtimes/android-arm/native/" />
+    <Content Include="runtimes/android-x64/native/libsodium.so" PackagePath="runtimes/android-x64/native/" />
+    <Content Include="runtimes/android-x86/native/libsodium.so" PackagePath="runtimes/android-x86/native/" />
   </ItemGroup>
 
 </Project>