Android: Bump ndk/ndk-glue to 0.3 and use constants for event ident (#1847)

Following the changes in [1] this bumps ndk and ndk-glue to 0.3 and uses
the new constants. The minor version has been bumped to prevent
applications from running an older winit (without #1826) with a newer
ndk/ndk-glue that does not pass this `ident` through the `data` pointer
anymore.

[1]: https://github.com/rust-windowing/android-ndk-rs/pull/112
This commit is contained in:
Marijn Suijten 2021-01-30 19:43:26 +01:00 committed by GitHub
parent f79c01b0cf
commit bd99eb1347
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View file

@ -6,6 +6,7 @@
- On Windows, fix bug causing mouse capture to not be released. - On Windows, fix bug causing mouse capture to not be released.
- On Windows, fix fullscreen not preserving minimized/maximized state. - On Windows, fix fullscreen not preserving minimized/maximized state.
- On Android, unimplemented events are marked as unhandled on the native event loop. - On Android, unimplemented events are marked as unhandled on the native event loop.
- On Android, bump `ndk` and `ndk-glue` to 0.3: use predefined constants for event `ident`.
# 0.24.0 (2020-12-09) # 0.24.0 (2020-12-09)

View file

@ -37,9 +37,9 @@ image = "0.23.12"
simple_logger = "1.9" simple_logger = "1.9"
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
ndk = "0.2.0" ndk = "0.3"
ndk-sys = "0.2.0" ndk-sys = "0.2.0"
ndk-glue = "0.2.0" ndk-glue = "0.3"
[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies] [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
objc = "0.2.7" objc = "0.2.7"

View file

@ -31,8 +31,8 @@ enum EventSource {
fn poll(poll: Poll) -> Option<EventSource> { fn poll(poll: Poll) -> Option<EventSource> {
match poll { match poll {
Poll::Event { ident, .. } => match ident { Poll::Event { ident, .. } => match ident {
0 => Some(EventSource::Callback), ndk_glue::NDK_GLUE_LOOPER_EVENT_PIPE_IDENT => Some(EventSource::Callback),
1 => Some(EventSource::InputQueue), ndk_glue::NDK_GLUE_LOOPER_INPUT_QUEUE_IDENT => Some(EventSource::InputQueue),
_ => unreachable!(), _ => unreachable!(),
}, },
Poll::Timeout => None, Poll::Timeout => None,