diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml index c75c997f..0be9e83e 100644 --- a/.github/workflows/build-native.yml +++ b/.github/workflows/build-native.yml @@ -72,7 +72,7 @@ jobs: if: matrix.os == 'android' shell: pwsh run: | - $CargoConfigFile = "~/.cargo/config" + $CargoConfigFile = "~/.cargo/config.toml" $AndroidToolchain="${Env:ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64" Get-ChildItem -Path $AndroidToolchain "libunwind.a" -Recurse | ForEach-Object { @@ -84,9 +84,11 @@ jobs: } } + Get-ChildItem -Path "$AndroidToolchain/bin/" + echo "[target.i686-linux-android]" >> $CargoConfigFile - echo "linker=`"$AndroidToolchain/bin/i686-linux-android19-clang`"" >> $CargoConfigFile - echo "CC_i686-linux-android=$AndroidToolchain/bin/i686-linux-android19-clang" >> $Env:GITHUB_ENV + echo "linker=`"$AndroidToolchain/bin/i686-linux-android21-clang`"" >> $CargoConfigFile + echo "CC_i686-linux-android=$AndroidToolchain/bin/i686-linux-android21-clang" >> $Env:GITHUB_ENV echo "AR_i686-linux-android=$AndroidToolchain/bin/llvm-ar" >> $Env:GITHUB_ENV echo "[target.x86_64-linux-android]" >> $CargoConfigFile