diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-01 06:18:50 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-01 06:18:50 +0000 |
commit | a81dd4bd968c07a37a19101521a42841b98463e3 (patch) | |
tree | 3d2e66dd60d36a1778a2c84ed94a2021e4dbad30 | |
parent | 5ef71c26cb00802a338ee47aebb6e238d76f6a2b (diff) | |
parent | 2158b39bde06d273be27f09ec17916dfb9abca01 (diff) | |
download | nix-android14-tests-release.tar.gz |
Snap for 9867821 from 2158b39bde06d273be27f09ec17916dfb9abca01 to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release
Change-Id: I0da775180ffa7037bf5c752440ced081bd323f0d
-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", )))] { |