chore(deps): Upgrade to ndk 0.9 and delete unused ndk-sys/ndk-context dependencies
#1296
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarijnS95
commented
Jun 17, 2024
| let mut pipe: [RawFd; 2] = Default::default(); | ||
| unsafe { libc::pipe(pipe.as_mut_ptr()) }; | ||
| pipe | ||
| unsafe { pipe.map(|fd| OwnedFd::from_raw_fd(fd)) } |
There was a problem hiding this comment.
It might be more convenient to use rustix here.
There was a problem hiding this comment.
let's keep what works for now, I'd rather migrate to something based on android-activity crate in the future.
Package Changes Through fc4d54aThere are 1 changes which include wry with minor Planned Package VersionsThe following package releases are the planned based on the context of changes in this pull request.
Add another change file through the GitHub UI by following this link. Read about change files or the docs at github.com/jbolda/covector |
amrbashir
previously approved these changes
Jul 17, 2024
amrbashir
previously approved these changes
Jul 17, 2024
MarijnS95
force-pushed
the
ndk-0.9
branch
2 times, most recently
from
00f4d08 to
58263c1
Compare
MarijnS95
added a commit
to MarijnS95/tao
that referenced
this pull request
Jul 17, 2024
Most changes were copied over from my `wry` PR at tauri-apps/wry#1296. Most notably a `&ThreadLooper` is now passed to `wry::android_setup()` because we have one, and it gives important safety guarantees when it comes to registering callbacks on this looper, without (unnecessarily!) requiring `Send`. A thread-local requirement already exists for the `JNIEnv` that is passed around anyway. Also note that certain workarounds and illogical inverted passes around `key_code()` handling are no longer needed, as the `ndk` crate now passes an `enum` with the raw `i32` around so that the `.into()` conversion for `i32` (the correct type) now becomes lossless.
MarijnS95
added a commit
to MarijnS95/tao
that referenced
this pull request
Jul 17, 2024
Most changes were copied over from my `wry` PR at tauri-apps/wry#1296. Most notably a `&ThreadLooper` is now passed to `wry::android_setup()` because we have one, and it gives important safety guarantees when it comes to registering callbacks on this looper, without (unnecessarily!) requiring `Send`. A thread-local requirement already exists for the `JNIEnv` that is passed around anyway. Also note that certain workarounds and illogical inverted passes around `key_code()` handling are no longer needed, as the `ndk` crate now passes an `enum` with the raw `i32` around so that the `.into()` conversion for `i32` (the correct type) now becomes lossless.
MarijnS95
changed the title
ndk 0.9 and delete unused ndk-sys/context dependenciesndk 0.9 and delete unused ndk-sys/ndk-context dependencies
amrbashir
requested changes
Jul 17, 2024
MarijnS95
force-pushed
the
ndk-0.9
branch
2 times, most recently
from
19fa538 to
3773ee3
Compare
MarijnS95
added a commit
to MarijnS95/tao
that referenced
this pull request
Jul 18, 2024
Most changes were copied over from my `wry` PR at tauri-apps/wry#1296. Most notably a `&ThreadLooper` is now passed to `wry::android_setup()` because we have one, and it gives important safety guarantees when it comes to registering callbacks on this looper, without (unnecessarily!) requiring `Send`. A thread-local requirement already exists for the `JNIEnv` that is passed around anyway. Also note that certain workarounds and illogical inverted passes around `key_code()` handling are no longer needed, as the `ndk` crate now passes an `enum` with the raw `i32` around so that the `.into()` conversion for `i32` (the correct type) now becomes lossless.
amrbashir
requested changes
Jul 18, 2024
The `ndk` crate received some marginal API upgrades, besides fixing soundness issues. Specifcally, `ForeignLooper::add_fd_with_callback()` now signifies that the incoming file descriptor is a `BorrowedFd` and the callback is executed on a different thread (where the looper is polled on the `ThreadLooper`) and must hence be `Send.`. It appears the `ndk-sys` and `ndk-context` crates are not used directly, hence they are removed from `Cargo.toml` here.
MarijnS95
added a commit
to MarijnS95/tao
that referenced
this pull request
Jul 18, 2024
Most changes were copied over from my `wry` PR at tauri-apps/wry#1296. Most notably a `&ThreadLooper` is now passed to `wry::android_setup()` because we have one, and it gives important safety guarantees when it comes to registering callbacks on this looper, without (unnecessarily!) requiring `Send`. A thread-local requirement already exists for the `JNIEnv` that is passed around anyway. Also note that certain workarounds and illogical inverted passes around `key_code()` handling are no longer needed, as the `ndk` crate now passes an `enum` with the raw `i32` around so that the `.into()` conversion for `i32` (the correct type) now becomes lossless.
amrbashir
approved these changes
Jul 18, 2024
amrbashir
pushed a commit
to tauri-apps/tao
that referenced
this pull request
Jul 18, 2024
…956) Most changes were copied over from my `wry` PR at tauri-apps/wry#1296. Most notably a `&ThreadLooper` is now passed to `wry::android_setup()` because we have one, and it gives important safety guarantees when it comes to registering callbacks on this looper, without (unnecessarily!) requiring `Send`. A thread-local requirement already exists for the `JNIEnv` that is passed around anyway. Also note that certain workarounds and illogical inverted passes around `key_code()` handling are no longer needed, as the `ndk` crate now passes an `enum` with the raw `i32` around so that the `.into()` conversion for `i32` (the correct type) now becomes lossless.
|
thank you |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1060
Closes #1061
The
ndkcrate received some marginal API upgrades, besides fixing soundness issues. Specifcally,ForeignLooper::add_fd_with_callback()now signifies that the incoming file descriptor is aBorrowedFdand the callback is executed on a different thread (where the looper is polled on theThreadLooper) and must hence beSend..It appears the
ndk-sysandndk-contextcrates are not used directly, hence they are removed fromCargo.tomlhere.