ci: build and verify bundled Android git libs

.gitea/workflows/android-build.yml

@@ -96,14 +96,27 @@ jobs:
           set -euxo pipefail
           printf 'sdk.dir=%s/.android/sdk\n' "$HOME" > local.properties
 
+      - name: Install Rust toolchain
+        shell: bash
+        run: |
+          set -euxo pipefail
+          if ! command -v cargo >/dev/null 2>&1; then
+            curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
+          fi
+          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
+          export PATH="$HOME/.cargo/bin:$PATH"
+          cargo --version
+          rustc --version
+
       - name: Compile bundled native Git binaries
         shell: bash
         run: |
           set -euxo pipefail
+          export PATH="$HOME/.cargo/bin:$PATH"
           export ANDROID_SDK_ROOT="$HOME/.android/sdk"
           export ANDROID_HOME="$ANDROID_SDK_ROOT"
           chmod +x ./AndroidProjectTooling.sh
-          bash ./AndroidProjectTooling.sh --compile-git
+          bash ./AndroidProjectTooling.sh --compile-android-git
 
       - name: Prepare CI build metadata
         id: build_meta
@@ -151,6 +164,8 @@ jobs:
           required = {
               'lib/arm64-v8a/libgit.so',
               'lib/armeabi-v7a/libgit.so',
+              'lib/x86/libgit.so',
+              'lib/x86_64/libgit.so',
           }
           found = {name for name in names if name in required}
           print('APK_NATIVE_GIT', sorted(found))
@@ -182,6 +197,8 @@ jobs:
           required = {
               'base/lib/arm64-v8a/libgit.so',
               'base/lib/armeabi-v7a/libgit.so',
+              'base/lib/x86/libgit.so',
+              'base/lib/x86_64/libgit.so',
           }
           found = {name for name in names if name in required}
           print('AAB_NATIVE_GIT', sorted(found))