summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Obenhuber <felix@obenhuber.de>2022-07-25 08:56:48 +0200
committerFelix Obenhuber <felix@obenhuber.de>2022-07-25 09:00:44 +0200
commite357d60cde1c3cf04ac4c17d33e5056c15028459 (patch)
treee961b7aac0523d3e03d146903931bfb675f1bd86
parent00f69814fe1eedb02464e976a2ebed3c1ecd973b (diff)
downloadnix-e357d60cde1c3cf04ac4c17d33e5056c15028459.zip
Add memfd for target_os = "android"
Memory fds (`memfd`) are implemented and exported by Androids bionic. Export the `memfd` module if the target os is `android`. https://cs.android.com/android/platform/superproject/+/master:bionic/libc/include/sys/mman.h;drc=23c7543b8e608ebcbb38b952761b54bb56065577;bpv=1;bpt=1;l=182
-rw-r--r--CHANGELOG.md2
-rw-r--r--src/sys/mod.rs2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9e7f6dc..6609e114 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
## [Unreleased] - ReleaseDate
### Added
+- Added `memfd` on Android.
+ (#[1773](https://github.com/nix-rust/nix/pull/1773))
- Added ETH_P_ALL to SockProtocol enum
(#[1768](https://github.com/nix-rust/nix/pull/1768))
- Added four non-standard Linux `SysconfVar` variants
diff --git a/src/sys/mod.rs b/src/sys/mod.rs
index ddd4fdfc..80c75e1f 100644
--- a/src/sys/mod.rs
+++ b/src/sys/mod.rs
@@ -50,7 +50,7 @@ feature! {
#[macro_use]
pub mod ioctl;
-#[cfg(target_os = "linux")]
+#[cfg(any(target_is = "android", target_os = "linux"))]
feature! {
#![feature = "fs"]
pub mod memfd;