Skip to content

Commit 488b8f9

Browse files
authored
ci(nuget): fix build for Android x86 (#280)
The Android 19 toolchain is not included anymore, so we bump the minimum supported version to Android 21 for i686 (x86) architecture.
1 parent c2ecda7 commit 488b8f9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

.github/workflows/build-native.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
if: matrix.os == 'android'
7373
shell: pwsh
7474
run: |
75-
$CargoConfigFile = "~/.cargo/config"
75+
$CargoConfigFile = "~/.cargo/config.toml"
7676
$AndroidToolchain="${Env:ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64"
7777
7878
Get-ChildItem -Path $AndroidToolchain "libunwind.a" -Recurse | ForEach-Object {
@@ -84,9 +84,11 @@ jobs:
8484
}
8585
}
8686
87+
Get-ChildItem -Path "$AndroidToolchain/bin/"
88+
8789
echo "[target.i686-linux-android]" >> $CargoConfigFile
88-
echo "linker=`"$AndroidToolchain/bin/i686-linux-android19-clang`"" >> $CargoConfigFile
89-
echo "CC_i686-linux-android=$AndroidToolchain/bin/i686-linux-android19-clang" >> $Env:GITHUB_ENV
90+
echo "linker=`"$AndroidToolchain/bin/i686-linux-android21-clang`"" >> $CargoConfigFile
91+
echo "CC_i686-linux-android=$AndroidToolchain/bin/i686-linux-android21-clang" >> $Env:GITHUB_ENV
9092
echo "AR_i686-linux-android=$AndroidToolchain/bin/llvm-ar" >> $Env:GITHUB_ENV
9193
9294
echo "[target.x86_64-linux-android]" >> $CargoConfigFile

0 commit comments

Comments
 (0)