Skip to content

fix(ci,jni): install Rust Android targets before JNI builds #28

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
TriForMine merged 1 commit into from
May 28, 2026
Merged

fix(ci,jni): install Rust Android targets before JNI builds #28

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion .github/workflows/android-jni.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- name: Install Rust Android targets
run: |
rustup target add aarch64-linux-android
rustup target add armv7-linux-androideabi
rustup target add x86_64-linux-android
- uses: Swatinem/rust-cache@v2
- name: Setup Java
uses: actions/setup-java@v4
Expand Down Expand Up @@ -61,4 +66,3 @@ jobs:
name: glyphnet-android-jni-libs
path: out/jniLibs
if-no-files-found: error

4 changes: 4 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions apps/expo-glyphnet/scripts/build-glyphnet-jni-android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ if ! command -v cargo-ndk >/dev/null 2>&1; then
exit 0
fi

echo "Ensuring Rust Android targets are installed..."
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
WORKSPACE_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
OUT_ROOT="${WORKSPACE_ROOT}/apps/expo-glyphnet/modules/glyphnet-scanner/android/src/main/jniLibs"
Expand Down
1 change: 1 addition & 0 deletions crates/glyphnet-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ time.workspace = true

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen.workspace = true
instant = { version = "0.1.13", features = ["wasm-bindgen"] }

[features]
default = ["svg"]
Expand Down
Loading