File tree Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -243,14 +243,21 @@ jobs:
243243 rustup target add aarch64-linux-android armv7-linux-androideabi
244244 sudo apt-get update
245245 sudo apt-get install llvm-dev libclang-dev clang g++-multilib gcc-multilib libc6-dev libc6-dev-arm64-cross
246+
247+ # See https://github.com/godot-rust/godot-rust/pull/920
248+ - name : " Workaround Android NDK due to Rust bug"
249+ run : >
250+ find -L $ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION -name libunwind.a
251+ -execdir sh -c 'echo "INPUT(-lunwind)" > libgcc.a' \;
252+
246253 - name : " Build Rust for targets: aarch64-linux-android, armv7-linux-androideabi"
247254 run : |
248255 export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang++
249256 export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++
250257 cargo build --target aarch64-linux-android --release
251258 cargo build --target armv7-linux-androideabi --release
252259 env :
253- ANDROID_NDK_VERSION : 21.4.7075529
260+ ANDROID_NDK_VERSION : 25.0.8775105
254261
255262 integration-test-godot :
256263 name : itest-godot-${{ matrix.godot }}${{ matrix.postfix }}
You can’t perform that action at this time.
0 commit comments