Recent versions of Android support EPOLLEXCLUSIVE

Enable epoll tests on Android, because they are passing.
nix-rust · Oct 16, 2021 · 6078479 · 6078479
1 parent da49e4f
commit 6078479
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [Unreleased] - ReleaseDate
+### Added
+
+- Added `EPOLLEXCLUSIVE` on Android.
+  (#[1567](https://github.com/nix-rust/nix/pull/1567))
+
+### Changed
+### Fixed
+### Removed
+
 ## [0.23.0] - 2021-09-28
 ### Added
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ targets = [
 ]
 
 [dependencies]
-libc = { version = "0.2.102", features = [ "extra_traits" ] }
+libc = { version = "0.2.104", features = [ "extra_traits" ] }
 bitflags = "1.3.1"
 cfg-if = "1.0"
 

diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs
@@ -18,7 +18,6 @@ libc_bitflags!(
         EPOLLERR;
         EPOLLHUP;
         EPOLLRDHUP;
-        #[cfg(target_os = "linux")]  // Added in 4.5; not in Android.
         EPOLLEXCLUSIVE;
         #[cfg(not(target_arch = "mips"))]
         EPOLLWAKEUP;

diff --git a/test/sys/mod.rs b/test/sys/mod.rs
@@ -30,7 +30,7 @@ mod test_ioctl;
 mod test_wait;
 mod test_uio;
 
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "android", target_os = "linux"))]
 mod test_epoll;
 #[cfg(target_os = "linux")]
 mod test_inotify;