Snap for 7236705 from 7a3543db3b04f7d62bdd827f0909ff030ad7c588 to sc-release

Change-Id: I7f87f362eccba15f0a0e20b285aee42ff9d4af75

5 files changed, 1810 insertions, 31 deletions

diff --git a/Android.bp b/Android.bp
index 727f8fb..6ae37fc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,21 +1,7 @@
-// This file is generated by cargo2android.py --device --run --dependencies --features io-util,macros,rt-multi-thread,sync,net,fs,time.
+// This file is generated by cargo2android.py --device --run --features io-util,macros,rt-multi-thread,sync,net,fs,time --tests.
+// Do not modify this file as changes will be overridden on upgrade.
 
-package {
-    default_applicable_licenses: ["external_rust_crates_tokio_license"],
-}
 
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_rust_crates_tokio_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-MIT",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
 
 rust_library {
     name: "libtokio",
@@ -53,18 +39,1364 @@ rust_library {
     proc_macros: ["libtokio_macros"],
 }
 
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   bytes-1.0.1 "default,std"
-//   cfg-if-1.0.0
-//   libc-0.2.86 "align,default,extra_traits,std"
-//   log-0.4.14
-//   memchr-2.3.4 "default,std"
-//   mio-0.7.7 "default,net,os-ext,os-poll,os-util,tcp,udp,uds"
-//   num_cpus-1.13.0
-//   pin-project-lite-0.2.4
-//   proc-macro2-1.0.24 "default,proc-macro"
-//   quote-1.0.8 "default,proc-macro"
-//   syn-1.0.60 "clone-impls,default,derive,extra-traits,full,parsing,printing,proc-macro,quote,visit-mut"
-//   tokio-macros-1.1.0
-//   unicode-xid-0.2.1 "default"
+rust_defaults {
+    name: "tokio_defaults",
+    crate_name: "tokio",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "bytes",
+        "fs",
+        "io-util",
+        "libc",
+        "macros",
+        "memchr",
+        "mio",
+        "net",
+        "num_cpus",
+        "rt",
+        "rt-multi-thread",
+        "sync",
+        "time",
+        "tokio-macros",
+    ],
+    flags: [
+        "--cfg tokio_track_caller",
+    ],
+    rustlibs: [
+        "libasync_stream",
+        "libbytes",
+        "libfutures",
+        "liblibc",
+        "libmemchr",
+        "libmio",
+        "libnix",
+        "libnum_cpus",
+        "libpin_project_lite",
+        "librand",
+        "libtokio_stream",
+        "libtokio_test",
+    ],
+    proc_macros: ["libtokio_macros"],
+}
+
+rust_defaults {
+    name: "tokio_defaults_tokio",
+    crate_name: "tokio",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "bytes",
+        "fs",
+        "io-util",
+        "libc",
+        "macros",
+        "memchr",
+        "mio",
+        "net",
+        "num_cpus",
+        "rt",
+        "rt-multi-thread",
+        "sync",
+        "time",
+        "tokio-macros",
+    ],
+    flags: [
+        "--cfg tokio_track_caller",
+    ],
+    rustlibs: [
+        "libasync_stream",
+        "libbytes",
+        "libfutures",
+        "liblibc",
+        "libmemchr",
+        "libmio",
+        "libnix",
+        "libnum_cpus",
+        "libpin_project_lite",
+        "librand",
+        "libtokio",
+        "libtokio_stream",
+        "libtokio_test",
+    ],
+    proc_macros: ["libtokio_macros"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_async_send_sync",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/async_send_sync.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_async_send_sync",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/async_send_sync.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_buffered",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/buffered.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_buffered",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/buffered.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_fs",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_fs",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_fs_copy",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_copy.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_fs_copy",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_copy.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_fs_dir",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_dir.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_fs_dir",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_dir.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_fs_file",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_file.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_fs_file",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_file.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_fs_file_mocked",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_file_mocked.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_fs_file_mocked",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_file_mocked.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_fs_link",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_link.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_fs_link",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/fs_link.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_async_fd",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_async_fd.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_async_fd",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_async_fd.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_async_read",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_async_read.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_async_read",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_async_read.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_chain",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_chain.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_chain",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_chain.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_copy",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_copy.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_copy",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_copy.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_driver",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_driver.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_driver",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_driver.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_driver_drop",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_driver_drop.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_driver_drop",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_driver_drop.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_lines",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_lines.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_lines",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_lines.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_mem_stream",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_mem_stream.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_mem_stream",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_mem_stream.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_read",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_read",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_read_buf",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_buf.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_read_buf",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_buf.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_read_exact",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_exact.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_read_exact",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_exact.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_read_line",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_line.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_read_line",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_line.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_read_to_end",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_to_end.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_read_to_end",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_to_end.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_read_to_string",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_to_string.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_read_to_string",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_to_string.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_read_until",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_until.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_read_until",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_read_until.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_split.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_split.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_take",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_take.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_take",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_take.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_write",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_write",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_write_all",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write_all.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_write_all",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write_all.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_write_buf",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write_buf.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_write_buf",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write_buf.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_write_int",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write_int.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_io_write_int",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/io_write_int.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_macros_join",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_join.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_macros_join",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_join.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_macros_pin",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_pin.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_macros_pin",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_pin.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_macros_select",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_select.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_macros_select",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_select.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_macros_test",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_test.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_macros_test",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_test.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_macros_try_join",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_try_join.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_macros_try_join",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/macros_try_join.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_net_bind_resource",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/net_bind_resource.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_net_bind_resource",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/net_bind_resource.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_net_lookup_host",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/net_lookup_host.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_net_lookup_host",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/net_lookup_host.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_no_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/no_rt.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_no_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/no_rt.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_process_issue_2174",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_issue_2174.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_process_issue_2174",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_issue_2174.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_process_issue_42",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_issue_42.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_process_issue_42",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_issue_42.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_process_kill_on_drop",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_kill_on_drop.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_process_kill_on_drop",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_kill_on_drop.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_process_smoke",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_smoke.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_process_smoke",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/process_smoke.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_rt_basic",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/rt_basic.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_rt_basic",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/rt_basic.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_rt_common",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/rt_common.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_rt_common",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/rt_common.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_rt_threaded",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/rt_threaded.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_rt_threaded",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/rt_threaded.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_ctrl_c",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_ctrl_c.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_ctrl_c",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_ctrl_c.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_drop_recv",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_drop_recv.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_drop_recv",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_drop_recv.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_drop_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_drop_rt.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_drop_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_drop_rt.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_drop_signal",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_drop_signal.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_drop_signal",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_drop_signal.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_multi_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_multi_rt.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_multi_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_multi_rt.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_no_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_no_rt.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_no_rt",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_no_rt.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_notify_both",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_notify_both.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_notify_both",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_notify_both.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_twice",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_twice.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_twice",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_twice.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_signal_usr1",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_usr1.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_signal_usr1",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/signal_usr1.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_barrier",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_barrier.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_barrier",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_barrier.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_broadcast",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_broadcast.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_broadcast",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_broadcast.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_errors",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_errors.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_errors",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_errors.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_mpsc",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_mpsc.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_mpsc",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_mpsc.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_mutex",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_mutex.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_mutex",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_mutex.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_mutex_owned",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_mutex_owned.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_mutex_owned",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_mutex_owned.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_notify",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_notify.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_notify",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_notify.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_oneshot",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_oneshot.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_oneshot",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_oneshot.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_rwlock",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_rwlock.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_rwlock",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_rwlock.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_semaphore",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_semaphore.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_semaphore",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_semaphore.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_semaphore_owned",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_semaphore_owned.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_semaphore_owned",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_semaphore_owned.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_sync_watch",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_watch.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_sync_watch",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/sync_watch.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_task_abort",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_abort.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_task_abort",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_abort.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_task_blocking",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_blocking.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_task_blocking",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_blocking.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_task_local",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_local.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_task_local",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_local.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_task_local_set",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_local_set.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_task_local_set",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/task_local_set.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_accept",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_accept.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_accept",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_accept.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_connect",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_connect.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_connect",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_connect.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_echo",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_echo.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_echo",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_echo.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_into_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_into_split.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_into_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_into_split.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_into_std",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_into_std.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_into_std",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_into_std.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_peek",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_peek.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_peek",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_peek.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_shutdown",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_shutdown.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_shutdown",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_shutdown.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_socket",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_socket.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_socket",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_socket.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_split.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_split.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_tcp_stream",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_stream.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_tcp_stream",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/tcp_stream.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_test_clock",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/test_clock.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_test_clock",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/test_clock.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_udp",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/udp.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_udp",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/udp.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_uds_cred",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_cred.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_uds_cred",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_cred.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_uds_datagram",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_datagram.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_uds_datagram",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_datagram.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_uds_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_split.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_uds_split",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_split.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_uds_stream",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_stream.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tokio_device_test_tests_uds_stream",
+    defaults: ["tokio_defaults_tokio"],
+    srcs: ["tests/uds_stream.rs"],
+}
+
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..5c61ac1
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,275 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "tokio_device_test_tests_io_read_line"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_semaphore"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_drop_signal"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_ctrl_c"
+    },
+    {
+      "name": "tokio_device_test_tests_io_write_buf"
+    },
+    {
+      "name": "tokio_device_test_tests_fs_file"
+    },
+    {
+      "name": "tokio_device_test_tests_io_write_int"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_no_rt"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_semaphore_owned"
+    },
+    {
+      "name": "tokio_device_test_tests_process_issue_42"
+    },
+    {
+      "name": "tokio_device_test_tests_task_local_set"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_stream"
+    },
+    {
+      "name": "tokio_device_test_tests_task_blocking"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_multi_rt"
+    },
+    {
+      "name": "tokio_device_test_tests_uds_split"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_split"
+    },
+    {
+      "name": "tokio_device_test_tests_macros_join"
+    },
+    {
+      "name": "tokio_device_test_tests_io_read"
+    },
+    {
+      "name": "tokio_device_test_tests_io_read_buf"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_notify_both"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_mutex_owned"
+    },
+    {
+      "name": "tokio_device_test_tests_net_lookup_host"
+    },
+    {
+      "name": "tokio_device_test_tests_buffered"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_usr1"
+    },
+    {
+      "name": "tokio_device_test_tests_rt_basic"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_connect"
+    },
+    {
+      "name": "futures-util_device_test_src_lib"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_oneshot"
+    },
+    {
+      "name": "tokio_device_test_tests_uds_cred"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_into_std"
+    },
+    {
+      "name": "tokio-test_device_test_tests_macros"
+    },
+    {
+      "name": "tokio_device_test_tests_io_write_all"
+    },
+    {
+      "name": "tokio_device_test_tests_io_read_exact"
+    },
+    {
+      "name": "tokio_device_test_tests_no_rt"
+    },
+    {
+      "name": "tokio_device_test_tests_rt_threaded"
+    },
+    {
+      "name": "tokio_device_test_tests_fs_dir"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_rwlock"
+    },
+    {
+      "name": "tokio_device_test_tests_io_read_to_string"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_shutdown"
+    },
+    {
+      "name": "tokio_device_test_tests_macros_select"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_accept"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_drop_rt"
+    },
+    {
+      "name": "tokio_device_test_tests_rt_common"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_broadcast"
+    },
+    {
+      "name": "tokio_device_test_tests_uds_stream"
+    },
+    {
+      "name": "tokio_device_test_tests_io_split"
+    },
+    {
+      "name": "tokio_device_test_tests_io_lines"
+    },
+    {
+      "name": "tokio_device_test_tests_process_issue_2174"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_mpsc"
+    },
+    {
+      "name": "tokio_device_test_tests_udp"
+    },
+    {
+      "name": "tokio_device_test_tests_macros_try_join"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_notify"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_mutex"
+    },
+    {
+      "name": "tokio_device_test_tests_task_abort"
+    },
+    {
+      "name": "tokio-test_device_test_tests_io"
+    },
+    {
+      "name": "tokio_device_test_tests_fs_link"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_twice"
+    },
+    {
+      "name": "tokio_device_test_tests_signal_drop_recv"
+    },
+    {
+      "name": "tokio_device_test_tests_io_async_fd"
+    },
+    {
+      "name": "tokio_device_test_tests_io_read_to_end"
+    },
+    {
+      "name": "tokio_device_test_tests_macros_pin"
+    },
+    {
+      "name": "tokio_device_test_tests_io_read_until"
+    },
+    {
+      "name": "tokio_device_test_tests_io_take"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_echo"
+    },
+    {
+      "name": "tokio_device_test_tests_net_bind_resource"
+    },
+    {
+      "name": "tokio_device_test_tests_macros_test"
+    },
+    {
+      "name": "tokio_device_test_tests_fs"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_watch"
+    },
+    {
+      "name": "tokio_device_test_tests_async_send_sync"
+    },
+    {
+      "name": "tokio_device_test_tests_io_copy"
+    },
+    {
+      "name": "tokio_device_test_tests_task_local"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_errors"
+    },
+    {
+      "name": "tokio_device_test_tests_fs_copy"
+    },
+    {
+      "name": "tokio_device_test_tests_process_kill_on_drop"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_into_split"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_peek"
+    },
+    {
+      "name": "tokio_device_test_tests_io_driver"
+    },
+    {
+      "name": "tokio_device_test_tests_io_mem_stream"
+    },
+    {
+      "name": "tokio_device_test_tests_process_smoke"
+    },
+    {
+      "name": "tokio_device_test_tests_uds_datagram"
+    },
+    {
+      "name": "tokio-test_device_test_tests_block_on"
+    },
+    {
+      "name": "tokio_device_test_tests_sync_barrier"
+    },
+    {
+      "name": "tokio_device_test_tests_tcp_socket"
+    },
+    {
+      "name": "tokio-test_device_test_src_lib"
+    },
+    {
+      "name": "tokio_device_test_tests_test_clock"
+    },
+    {
+      "name": "tokio_device_test_tests_fs_file_mocked"
+    },
+    {
+      "name": "tokio_device_test_tests_io_write"
+    },
+    {
+      "name": "tokio_device_test_tests_io_driver_drop"
+    },
+    {
+      "name": "tokio_device_test_tests_io_chain"
+    },
+    {
+      "name": "tokio_device_test_tests_io_async_read"
+    }
+  ]
+}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..1670d12
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,159 @@
+diff --git a/Android.bp b/Android.bp
+index 1b9828d..6ae37fc 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -75,28 +75,13 @@ rust_defaults {
+         "libnix",
+         "libnum_cpus",
+         "libpin_project_lite",
+-        "libproptest",
+         "librand",
+-        "libtempfile",
+         "libtokio_stream",
+         "libtokio_test",
+     ],
+     proc_macros: ["libtokio_macros"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_src_lib",
+-    defaults: ["tokio_defaults"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_src_lib",
+-    defaults: ["tokio_defaults"],
+-}
+-
+ rust_defaults {
+     name: "tokio_defaults_tokio",
+     crate_name: "tokio",
+@@ -132,9 +117,7 @@ rust_defaults {
+         "libnix",
+         "libnum_cpus",
+         "libpin_project_lite",
+-        "libproptest",
+         "librand",
+-        "libtempfile",
+         "libtokio",
+         "libtokio_stream",
+         "libtokio_test",
+@@ -142,21 +125,6 @@ rust_defaults {
+     proc_macros: ["libtokio_macros"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests__require_full",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/_require_full.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests__require_full",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/_require_full.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_async_send_sync",
+     defaults: ["tokio_defaults_tokio"],
+@@ -1357,81 +1325,6 @@ rust_test {
+     srcs: ["tests/test_clock.rs"],
+ }
+ 
+-rust_test_host {
+-    name: "tokio_host_test_tests_time_interval",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_interval.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_time_interval",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_interval.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_time_pause",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_pause.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_time_pause",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_pause.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_time_rt",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_rt.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_time_rt",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_rt.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_time_sleep",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_sleep.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_time_sleep",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_sleep.rs"],
+-}
+-
+-rust_test_host {
+-    name: "tokio_host_test_tests_time_timeout",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_timeout.rs"],
+-    test_options: {
+-        unit_test: true,
+-    },
+-}
+-
+-rust_test {
+-    name: "tokio_device_test_tests_time_timeout",
+-    defaults: ["tokio_defaults_tokio"],
+-    srcs: ["tests/time_timeout.rs"],
+-}
+-
+ rust_test_host {
+     name: "tokio_host_test_tests_udp",
+     defaults: ["tokio_defaults_tokio"],
+@@ -1507,11 +1400,3 @@ rust_test {
+     srcs: ["tests/uds_stream.rs"],
+ }
+ 
+-Errors in cargo.out:
+-error: run main Tokio tests with `--features full`
+-error: aborting due to previous error
+-error: could not compile `tokio`
+-error[E0599]: no method named `pause` found for struct `clock::Clock` in the current scope
+-error[E0599]: no method named `pause` found for struct `clock::Clock` in the current scope
+-error: aborting due to 2 previous errors
+-error: build failed
diff --git a/patches/sync_broadcast.patch b/patches/sync_broadcast.patch
new file mode 100644
index 0000000..c63a4a7
--- /dev/null
+++ b/patches/sync_broadcast.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/sync_broadcast.rs b/tests/sync_broadcast.rs
+index 5f79800..9ef7927 100644
+--- a/tests/sync_broadcast.rs
++++ b/tests/sync_broadcast.rs
+@@ -286,6 +286,7 @@ fn capacity_too_big() {
+ }
+ 
+ #[test]
++#[cfg(not(target_os = "android"))]
+ fn panic_in_clone() {
+     use std::panic::{self, AssertUnwindSafe};
+ 
diff --git a/tests/sync_broadcast.rs b/tests/sync_broadcast.rs
index 5f79800..9ef7927 100644
--- a/tests/sync_broadcast.rs
+++ b/tests/sync_broadcast.rs
@@ -286,6 +286,7 @@ fn capacity_too_big() {
 }
 
 #[test]
+#[cfg(not(target_os = "android"))]
 fn panic_in_clone() {
     use std::panic::{self, AssertUnwindSafe};