Remove work around for Android simulator

Use accept4 instead.
tokio-rs · Jun 9, 2024 · 4e4f913 · 4e4f913
1 parent 5200f6c
commit 4e4f913
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/sys/unix/tcp.rs b/src/sys/unix/tcp.rs
@@ -58,9 +58,7 @@ pub(crate) fn accept(listener: &net::TcpListener) -> io::Result<(net::TcpStream,
     // On platforms that support it we can use `accept4(2)` to set `NONBLOCK`
     // and `CLOEXEC` in the call to accept the connection.
     #[cfg(any(
-        // Android x86's seccomp profile forbids calls to `accept4(2)`
-        // See https://github.com/tokio-rs/mio/issues/1445 for details
-        all(not(target_arch="x86"), target_os = "android"),
+        target_os = "android",
         target_os = "dragonfly",
         target_os = "freebsd",
         target_os = "illumos",
@@ -93,7 +91,6 @@ pub(crate) fn accept(listener: &net::TcpListener) -> io::Result<(net::TcpStream,
         target_os = "vita",
         target_os = "hermit",
         target_os = "nto",
-        all(target_arch = "x86", target_os = "android"),
     ))]
     let stream = {
         syscall!(accept(
@@ -106,9 +103,7 @@ pub(crate) fn accept(listener: &net::TcpListener) -> io::Result<(net::TcpStream,
             #[cfg(not(any(target_os = "espidf", target_os = "vita")))]
             syscall!(fcntl(s.as_raw_fd(), libc::F_SETFD, libc::FD_CLOEXEC))?;
 
-            // See https://github.com/tokio-rs/mio/issues/1450
             #[cfg(any(
-                all(target_arch = "x86", target_os = "android"),
                 target_os = "espidf",
                 target_os = "vita",
                 target_os = "hermit",

diff --git a/src/sys/unix/uds/listener.rs b/src/sys/unix/uds/listener.rs
@@ -44,9 +44,6 @@ pub(crate) fn accept(listener: &net::UnixListener) -> io::Result<(UnixStream, So
         target_os = "espidf",
         target_os = "vita",
         target_os = "nto",
-        // Android x86's seccomp profile forbids calls to `accept4(2)`
-        // See https://github.com/tokio-rs/mio/issues/1445 for details
-        all(target_arch = "x86", target_os = "android"),
     )))]
     let socket = {
         let flags = libc::SOCK_NONBLOCK | libc::SOCK_CLOEXEC;
@@ -70,7 +67,6 @@ pub(crate) fn accept(listener: &net::UnixListener) -> io::Result<(UnixStream, So
         target_os = "espidf",
         target_os = "vita",
         target_os = "nto",
-        all(target_arch = "x86", target_os = "android")
     ))]
     let socket = syscall!(accept(
         listener.as_raw_fd(),
@@ -84,13 +80,7 @@ pub(crate) fn accept(listener: &net::UnixListener) -> io::Result<(UnixStream, So
         #[cfg(not(any(target_os = "espidf", target_os = "vita")))]
         syscall!(fcntl(socket, libc::F_SETFD, libc::FD_CLOEXEC))?;
 
-        // See https://github.com/tokio-rs/mio/issues/1450
-        #[cfg(any(
-            all(target_arch = "x86", target_os = "android"),
-            target_os = "espidf",
-            target_os = "vita",
-            target_os = "nto",
-        ))]
+        #[cfg(any(target_os = "espidf", target_os = "vita", target_os = "nto"))]
         syscall!(fcntl(socket, libc::F_SETFL, libc::O_NONBLOCK))?;
 
         Ok(s)