From 38fdc24a49759a49e642c87958ab1dc224760492 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Sun, 17 May 2026 11:00:57 +0200
Subject: [PATCH] Use cargo-ndk for env (#900)

* Use cargo-ndk for env

* Update build.yml
---
 .github/workflows/build.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 85bfa14d..c92081a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -273,11 +273,9 @@ jobs:
           packages: build-tools;37.0.0 platforms;android-30 platforms;android-36 ndk;${{ matrix.ndk-version }}
       - name: Build
         run: |
-          cargo install cargo-apk
-          cargo apk build --target aarch64-linux-android --lib
-        env:
-          LIBCLANG_PATH: ${{ env.ANDROID_HOME }}/ndk/${{ matrix.ndk-version }}/toolchains/llvm/prebuilt/linux-x86_64/musl/lib
-          BINDGEN_EXTRA_CLANG_ARGS: --sysroot=${{ env.ANDROID_HOME }}/ndk/${{ matrix.ndk-version }}/toolchains/llvm/prebuilt/linux-x86_64/sysroot
+          cargo install cargo-apk cargo-ndk
+          source <(cargo ndk-env --target ${{ matrix.target }})
+          cargo apk build --target ${{ matrix.target }} --lib
 
   collect-artifacts:
     name: Collect release artifacts