Skip to content

Update Android NDK (21 -> 25), workaround Rust bug #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Aug 3, 2022
Merged

Update Android NDK (21 -> 25), workaround Rust bug #920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/full-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,21 @@ jobs:
rustup target add aarch64-linux-android armv7-linux-androideabi
sudo apt-get update
sudo apt-get install llvm-dev libclang-dev clang g++-multilib gcc-multilib libc6-dev libc6-dev-arm64-cross

# See https://github.com/godot-rust/godot-rust/pull/920
- name: "Workaround Android NDK due to Rust bug"
run: >
find -L $ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION -name libunwind.a
-execdir sh -c 'echo "INPUT(-lunwind)" > libgcc.a' \;

- name: "Build Rust for targets: aarch64-linux-android, armv7-linux-androideabi"
run: |
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++
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++
cargo build --target aarch64-linux-android --release
cargo build --target armv7-linux-androideabi --release
env:
ANDROID_NDK_VERSION: 21.4.7075529
ANDROID_NDK_VERSION: 25.0.8775105

integration-test-godot:
name: itest-godot-${{ matrix.godot }}${{ matrix.postfix }}
Expand Down