Fixed android action env

albbus-stack · May 29, 2024 · 95f6a99 · 95f6a99
1 parent 88097e4
commit 95f6a99
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -48,16 +48,18 @@ jobs:
         env:
           NDK_HOME: ${{ steps.ndk.outputs.ndk-path }}
         run: |
-          echo "NDK_HOME=$NDK_HOME" >> $GITHUB_ENV
-          echo "ANDROID_NDK_HOME=$NDK_HOME" >> $GITHUB_ENV
+          export ANDROID_NDK_HOME=$NDK_HOME
+          export TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64
 
-          echo "TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64" >> $GITHUB_ENV
+          echo "NDK_HOME=$NDK_HOME" >> $GITHUB_ENV
+          echo "ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> $GITHUB_ENV
+          echo "TOOLCHAIN=$TOOLCHAIN" >> $GITHUB_ENV
           echo "AR=$TOOLCHAIN/bin/llvm-ar" >> $GITHUB_ENV
           echo "LD=$TOOLCHAIN/bin/ld" >> $GITHUB_ENV
           echo "RANLIB=$TOOLCHAIN/bin/llvm-ranlib" >> $GITHUB_ENV
           echo "STRIP=$TOOLCHAIN/bin/llvm-strip" >> $GITHUB_ENV
 
-          echo "PATH=$TOOLCHAIN/bin:$NDK_HOME:$PATH" >> $GITHUB_ENV
+          echo "PATH=$TOOLCHAIN/bin:$PATH" >> $GITHUB_ENV
 
       - name: Setup Rust
         uses: actions-rs/toolchain@v1