Skip to content

Commit

Permalink
Revert ndk-glue to 0.5 to synchronize with winit (bevyengine#4916)
Browse files Browse the repository at this point in the history
# Objective

- Upgrading ndk-glue (our Android interop layer) desynchronized us from winit
- This further broke Android builds, see bevyengine#4905 (oops...)
- Reverting to 0.5 should help with this, until the new `winit` version releases
- Fixes bevyengine#4774 and closes bevyengine#4529
  • Loading branch information
alice-i-cecile authored and james7132 committed Oct 28, 2022
1 parent 3f793d8 commit ff8dc73
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion crates/bevy_asset/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ wasm-bindgen-futures = "0.4"
js-sys = "0.3"

[target.'cfg(target_os = "android")'.dependencies]
ndk-glue = { version = "0.6" }
ndk-glue = { version = "0.5" }

[dev-dependencies]
futures-lite = "1.4.0"
Expand Down
4 changes: 3 additions & 1 deletion crates/bevy_internal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,6 @@ bevy_winit = { path = "../bevy_winit", optional = true, version = "0.8.0-dev" }
bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.8.0-dev" }

[target.'cfg(target_os = "android")'.dependencies]
ndk-glue = {version = "0.6", features = ["logger"]}
# This version *must* be the same as the version used by winit,
# or Android will break: https://github.com/rust-windowing/winit#android
ndk-glue = {version = "0.5", features = ["logger"]}

0 comments on commit ff8dc73

Please sign in to comment.