diff options
| author | Zach Johnson <zachoverflow@google.com> | 2020-11-17 22:00:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-17 22:00:21 +0000 |
| commit | 4845c67c113d69cf2fd630f778fb5ecf1471b65f (patch) | |
| tree | f995c2cd6134773d6b0f89007e5cd21e79473e03 | |
| parent | 9dc313aeb2947b5871e479473f002a9e073c5c83 (diff) | |
| parent | 1d8befebc616a6c5019b9d2fc3a2e0f4988ff9b1 (diff) | |
| download | nix-4845c67c113d69cf2fd630f778fb5ecf1471b65f.tar.gz | |
Allow android compiled binaries to use timerfd am: 324882d3be am: 87748e1d26 am: 73d55fe6b7 am: 1d8befebc6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/1502092
Change-Id: Idb3248d570862bff9984aedac8448a73dc9501ce
| -rw-r--r-- | patches/0001-Allow-android-compiled-binaries-to-use-timerfd.patch | 26 | ||||
| -rw-r--r-- | src/sys/mod.rs | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/patches/0001-Allow-android-compiled-binaries-to-use-timerfd.patch b/patches/0001-Allow-android-compiled-binaries-to-use-timerfd.patch new file mode 100644 index 0000000..e164a3c --- /dev/null +++ b/patches/0001-Allow-android-compiled-binaries-to-use-timerfd.patch @@ -0,0 +1,26 @@ +From e09a4f4e8661e8036819deb97dc1d9fcf2a49d2b Mon Sep 17 00:00:00 2001 +From: Zach Johnson <zachoverflow@google.com> +Date: Tue, 17 Nov 2020 11:05:57 -0800 +Subject: [PATCH] Allow android compiled binaries to use timerfd + +Bug: 171749953 +Test: compile +Change-Id: Iaf16615cf834df02537e3b569ab08dd98a497a70 +--- + src/sys/mod.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sys/mod.rs b/src/sys/mod.rs +index bf7f541..b8b9e6f 100644 +--- a/src/sys/mod.rs ++++ b/src/sys/mod.rs +@@ -103,5 +103,5 @@ pub mod wait; + #[cfg(any(target_os = "android", target_os = "linux"))] + pub mod inotify; + +-#[cfg(target_os = "linux")] ++#[cfg(any(target_os = "android", target_os = "linux"))] + pub mod timerfd; +-- +2.29.2.299.gdc1121823c-goog + diff --git a/src/sys/mod.rs b/src/sys/mod.rs index bf7f541..b8b9e6f 100644 --- a/src/sys/mod.rs +++ b/src/sys/mod.rs @@ -103,5 +103,5 @@ pub mod wait; #[cfg(any(target_os = "android", target_os = "linux"))] pub mod inotify; -#[cfg(target_os = "linux")] +#[cfg(any(target_os = "android", target_os = "linux"))] pub mod timerfd; |