Try

james58899 · Jun 5, 2024 · d447f47 · d447f47
1 parent be219ec
commit d447f47
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -174,12 +174,6 @@ jobs:
         target: ["aarch64-linux-android", "armv7-linux-androideabi", "i686-linux-android", "x86_64-linux-android"]
     steps:
     - uses: actions/checkout@v4
-    - name: Install Android NDK
-      id: setup-ndk
-      uses: nttld/setup-ndk@v1
-      with:
-        ndk-version: r26d
-        add-to-path: false
     - uses: actions/cache@v4
       with:
         path: |
@@ -195,15 +189,15 @@ jobs:
         rustup target add ${{ matrix.target }}
     - name: Build
       env:
-        ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
         CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER: "aarch64-linux-android21-clang"
         CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER: "armv7a-linux-androideabi21-clang"
         CARGO_TARGET_I686_LINUX_ANDROID_LINKER: "i686-linux-android21-clang"
         CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER: "x86_64-linux-android21-clang"
+        CC_i686-linux-android: "i686-linux-android21-clang"
+        CC_x86_64-linux-android: "x86_64-linux-android21-clang"
       run: |
-        export PATH=$PATH:${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
-        env
-        ls ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
+        export PATH=$PATH:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
+        ls ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
         cargo build --verbose --release --target=${{ matrix.target }}
     - uses: actions/upload-artifact@v4
       with: