diff options
| author | Luke Huang <huangluke@google.com> | 2021-05-30 08:40:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-30 08:40:50 +0000 |
| commit | 0d66e18fb85a0d694d52ca0e873d162c070094a0 (patch) | |
| tree | 9960fb5406e537c303b85517c25ac6c65d47d634 /patches/io_mem_stream.patch | |
| parent | 55513e0bfafb02059e7c43f7accedaf0e651bbac (diff) | |
| parent | d4230f61dfcffdae2dda70d2103abf5699616382 (diff) | |
| download | tokio-0d66e18fb85a0d694d52ca0e873d162c070094a0.tar.gz | |
Merge "Upgrade rust/crates/tokio to 1.6.0 and use cargo2android.json to generate bp file" am: d4230f61df
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1718994
Change-Id: I6f3bef3d4f45e33471fc70d0e7648912a994705a
Diffstat (limited to 'patches/io_mem_stream.patch')
| -rw-r--r-- | patches/io_mem_stream.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/patches/io_mem_stream.patch b/patches/io_mem_stream.patch new file mode 100644 index 0000000..c21ce18 --- /dev/null +++ b/patches/io_mem_stream.patch @@ -0,0 +1,12 @@ +diff --git a/tests/io_mem_stream.rs b/tests/io_mem_stream.rs +index 01baa53..520391a 100644 +--- a/tests/io_mem_stream.rs ++++ b/tests/io_mem_stream.rs +@@ -63,6 +63,7 @@ async fn disconnect() { + } + + #[tokio::test] ++#[cfg(not(target_os = "android"))] + async fn disconnect_reader() { + let (a, mut b) = duplex(2); + |