From e387cff7a3eb442aa0a0b84a3ebb6f170e205ea2 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Mon, 27 Jun 2022 11:05:10 -0700 Subject: [PATCH] Also use fallback for futimens on Android futimens requires Android API level 19, and std still supports older API levels. --- library/std/src/sys/unix/fs.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs index db81b26e7e7..91deff71e42 100644 --- a/library/std/src/sys/unix/fs.rs +++ b/library/std/src/sys/unix/fs.rs @@ -19,7 +19,7 @@ target_os = "ios", ))] use crate::sys::weak::syscall; -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "android", target_os = "macos"))] use crate::sys::weak::weak; use libc::{c_int, mode_t}; @@ -1064,8 +1064,8 @@ pub fn set_permissions(&self, perm: FilePermissions) -> io::Result<()> { pub fn set_times(&self, times: FileTimes) -> io::Result<()> { cfg_if::cfg_if! { - // futimens requires macOS 10.13 - if #[cfg(target_os = "macos")] { + // futimens requires macOS 10.13, and Android API level 19 + if #[cfg(any(target_os = "android", target_os = "macos"))] { fn ts_to_tv(ts: &libc::timespec) -> libc::timeval { libc::timeval { tv_sec: ts.tv_sec, tv_usec: (ts.tv_nsec / 1000) as _ } }