Skip to content

Commit

Permalink
Merge pull request #128 from rust-mobile/ndk-stable
Browse files Browse the repository at this point in the history
Upgrade to stable `ndk 0.8` and `ndk-sys 0.5` releases
  • Loading branch information
rib authored Oct 15, 2023
2 parents 3d5e479 + 2ecaab9 commit a291e37
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions android-activity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ log = "0.4"
jni-sys = "0.3"
cesu8 = "1"
jni = "0.21"
ndk-sys = "0.5.0-beta.0"
ndk = "0.8.0-beta.0"
ndk-sys = "0.5.0"
ndk = "0.8.0"
ndk-context = "0.1"
android-properties = "0.2"
num_enum = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion android-activity/src/native_activity/glue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ extern "C" fn ANativeActivity_onCreate(
// code to look up non-standard Java classes.
android_main(app);
})
.unwrap_or_else(|panic| log_panic(panic));
.unwrap_or_else(log_panic);

// Let JVM know that our Activity can be destroyed before detaching from the JVM
//
Expand Down
9 changes: 4 additions & 5 deletions android-activity/src/native_activity/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,13 @@ impl<'a> InputIteratorInner<'a> {
return false;
};

// Note: we basically ignore errors from get_event() currently. Looking
// at the source code for Android's InputQueue, the only error that
// can be returned here is 'WOULD_BLOCK', which we want to just treat as
// meaning the queue is empty.
// Note: we basically ignore errors from event() currently. Looking at the source code for
// Android's InputQueue, the only error that can be returned here is 'WOULD_BLOCK', which we
// want to just treat as meaning the queue is empty.
//
// ref: https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/jni/android_view_InputQueue.cpp
//
if let Ok(Some(ndk_event)) = queue.get_event() {
if let Ok(Some(ndk_event)) = queue.event() {
log::trace!("queue: got event: {ndk_event:?}");

if let Some(ndk_event) = queue.pre_dispatch(ndk_event) {
Expand Down

0 comments on commit a291e37

Please sign in to comment.