Skip to content

feat: Disable advisory-lock for Android API 26 compatibility #2399 #423

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

Open
conanchen wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Disable advisory-lock for Android API 26 compatibility #2399 #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
662146c
fix: Android API 26 compatibility by excluding unixsock transport
conanchen Feb 1, 2026
f7eb7d7
fix: Android API 26 compatibility by excluding unixsock transport
conanchen Feb 1, 2026
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: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@
/build/
/.gradle/
*/build/

# Android JNI compiled libraries
jni/

# Cargo configuration files
zenoh-jni/.cargo/
20 changes: 17 additions & 3 deletions zenoh-jni/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,21 @@ description = "Zenoh: Zero Overhead Pub/sub, Store/Query and Compute."
name = "zenoh_jni"

[features]
default = ["zenoh/default", "zenoh-ext"]
# Exclude transport_unixsock-stream for Android compatibility (avoid syncfs from nix fs feature)
default = [
"zenoh/auth_pubkey",
"zenoh/auth_usrpwd",
"zenoh/transport_compression",
"zenoh/transport_multilink",
"zenoh/transport_quic",
"zenoh/transport_quic_datagram",
"zenoh/transport_tcp",
"zenoh/transport_tls",
"zenoh/transport_udp",
"zenoh/transport_ws",
"zenoh-ext",
]
default-no-unixsock = ["zenoh/default", "zenoh-ext"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
Expand All @@ -36,8 +50,8 @@ flume = "0.10.14"
uhlc = "0.8.0"
json5 = "0.4.1"
serde_yaml = "0.9.19"
zenoh = { version = "1.7.2", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false }
zenoh-ext = { version = "1.7.2", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["internal"], default-features = false, optional = true }
zenoh = { path = "../../zenoh/zenoh", features = ["unstable", "internal"], default-features = false }
zenoh-ext = { path = "../../zenoh/zenoh-ext", features = ["internal"], default-features = false, optional = true }
tracing = { version = "0.1" , features = ["log"] }
[lib]
name = "zenoh_jni"
Expand Down
Loading