diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-01 23:16:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-01 23:16:57 +0000 |
| commit | 9cd9de388271d4f2b9234ef1044c9012d4747407 (patch) | |
| tree | 3d2e66dd60d36a1778a2c84ed94a2021e4dbad30 | |
| parent | 3368eda949a7f7111ff0dd87ac36dd769cf25254 (diff) | |
| parent | 2b415e735c652f4f857cbdf3b68d99ed1d6453da (diff) | |
| download | nix-android14-d1-release.tar.gz | |
Snap for 9869615 from 2b415e735c652f4f857cbdf3b68d99ed1d6453da to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-release
Change-Id: I4d751caffae71a088aeadc617d55e2a758a6c66e
| -rw-r--r-- | patches/memfd.diff | 15 | ||||
| -rw-r--r-- | src/sys/memfd.rs | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/patches/memfd.diff b/patches/memfd.diff new file mode 100644 index 0000000..a5d4609 --- /dev/null +++ b/patches/memfd.diff @@ -0,0 +1,15 @@ +diff --git a/src/sys/memfd.rs b/src/sys/memfd.rs +index ad9345e..e43e1e5 100644 +--- a/src/sys/memfd.rs ++++ b/src/sys/memfd.rs +@@ -49,7 +49,9 @@ pub fn memfd_create(name: &CStr, flags: MemFdCreateFlag) -> Result<RawFd> { + any( + target_os = "freebsd", + // If the OS is Linux, gnu and musl expose a memfd_create symbol but not uclibc +- target_env = "gnu", ++ // ++ // ANDROID: Our glibc is too old to have memfd_create. ++ // target_env = "gnu", + target_env = "musl", + )))] + { diff --git a/src/sys/memfd.rs b/src/sys/memfd.rs index ad9345e..e43e1e5 100644 --- a/src/sys/memfd.rs +++ b/src/sys/memfd.rs @@ -49,7 +49,9 @@ pub fn memfd_create(name: &CStr, flags: MemFdCreateFlag) -> Result<RawFd> { any( target_os = "freebsd", // If the OS is Linux, gnu and musl expose a memfd_create symbol but not uclibc - target_env = "gnu", + // + // ANDROID: Our glibc is too old to have memfd_create. + // target_env = "gnu", target_env = "musl", )))] { |