Snap for 8730993 from b8563af5d8e399995ad8a5d01bf40ee260885b32 to mainline-tzdata3-release

Change-Id: I7a6d2d82c40a61efa7b7591353df65ea16a49178
diff --git a/Android.bp b/Android.bp
index bee1f8a..a499240 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,8 +22,6 @@
     name: "libtokio",
     host_supported: true,
     crate_name: "tokio",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.14.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -55,18 +53,14 @@
     proc_macros: ["libtokio_macros"],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
         "com.android.resolv",
-        "com.android.uwb",
     ],
-    vendor_available: true,
     min_sdk_version: "29",
 }
 
 rust_defaults {
     name: "tokio_defaults_tokio",
     crate_name: "tokio",
-    cargo_env_compat: true,
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -106,10 +100,9 @@
     proc_macros: ["libtokio_macros"],
 }
 
-rust_test {
-    name: "tokio_test_tests__require_full",
+rust_test_host {
+    name: "tokio_host_test_tests__require_full",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
     srcs: ["tests/_require_full.rs"],
     test_options: {
         unit_test: true,
@@ -117,9 +110,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_buffered",
+    name: "tokio_device_test_tests__require_full",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/_require_full.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_buffered",
+    defaults: ["tokio_defaults_tokio"],
     srcs: ["tests/buffered.rs"],
     test_options: {
         unit_test: true,
@@ -127,19 +125,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_async_fd",
+    name: "tokio_device_test_tests_buffered",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
-    srcs: ["tests/io_async_fd.rs"],
-    test_options: {
-        unit_test: true,
-    },
+    srcs: ["tests/buffered.rs"],
 }
 
-rust_test {
-    name: "tokio_test_tests_io_async_read",
+rust_test_host {
+    name: "tokio_host_test_tests_io_async_read",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
     srcs: ["tests/io_async_read.rs"],
     test_options: {
         unit_test: true,
@@ -147,9 +140,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_chain",
+    name: "tokio_device_test_tests_io_async_read",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -157,9 +155,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_copy",
+    name: "tokio_device_test_tests_io_chain",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -167,9 +170,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_copy_bidirectional",
+    name: "tokio_device_test_tests_io_copy",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/io_copy.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_copy_bidirectional",
+    defaults: ["tokio_defaults_tokio"],
     srcs: ["tests/io_copy_bidirectional.rs"],
     test_options: {
         unit_test: true,
@@ -177,9 +185,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_driver",
+    name: "tokio_device_test_tests_io_copy_bidirectional",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/io_copy_bidirectional.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,
@@ -187,9 +200,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_driver_drop",
+    name: "tokio_device_test_tests_io_driver",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -197,9 +215,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_lines",
+    name: "tokio_device_test_tests_io_driver_drop",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -207,9 +230,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_mem_stream",
+    name: "tokio_device_test_tests_io_lines",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -217,9 +245,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read",
+    name: "tokio_device_test_tests_io_mem_stream",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -227,9 +260,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_buf",
+    name: "tokio_device_test_tests_io_read",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -237,9 +275,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_exact",
+    name: "tokio_device_test_tests_io_read_buf",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -247,9 +290,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_line",
+    name: "tokio_device_test_tests_io_read_exact",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -257,9 +305,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_to_end",
+    name: "tokio_device_test_tests_io_read_line",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -267,9 +320,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_to_string",
+    name: "tokio_device_test_tests_io_read_to_end",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -277,9 +335,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_until",
+    name: "tokio_device_test_tests_io_read_to_string",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -287,9 +350,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_split",
+    name: "tokio_device_test_tests_io_read_until",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -297,9 +365,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_take",
+    name: "tokio_device_test_tests_io_split",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -307,9 +380,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write",
+    name: "tokio_device_test_tests_io_take",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -317,9 +395,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write_all",
+    name: "tokio_device_test_tests_io_write",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -327,9 +410,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write_buf",
+    name: "tokio_device_test_tests_io_write_all",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -337,9 +425,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write_int",
+    name: "tokio_device_test_tests_io_write_buf",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -347,9 +440,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_join",
+    name: "tokio_device_test_tests_io_write_int",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -357,9 +455,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_pin",
+    name: "tokio_device_test_tests_macros_join",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -367,9 +470,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_select",
+    name: "tokio_device_test_tests_macros_pin",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -377,9 +485,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_test",
+    name: "tokio_device_test_tests_macros_select",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -387,9 +500,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_try_join",
+    name: "tokio_device_test_tests_macros_test",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -397,9 +515,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_net_bind_resource",
+    name: "tokio_device_test_tests_macros_try_join",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -407,9 +530,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_net_lookup_host",
+    name: "tokio_device_test_tests_net_bind_resource",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -417,9 +545,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_no_rt",
+    name: "tokio_device_test_tests_net_lookup_host",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -427,9 +560,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_process_kill_on_drop",
+    name: "tokio_device_test_tests_no_rt",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/no_rt.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,
@@ -437,9 +575,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_rt_basic",
+    name: "tokio_device_test_tests_process_kill_on_drop",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/process_kill_on_drop.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,
@@ -447,9 +590,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_rt_common",
+    name: "tokio_device_test_tests_rt_basic",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -457,9 +605,15 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_rt_threaded",
+    name: "tokio_device_test_tests_rt_common",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -467,9 +621,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_barrier",
+    name: "tokio_device_test_tests_rt_threaded",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/rt_threaded.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,
@@ -477,9 +636,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_broadcast",
+    name: "tokio_device_test_tests_sync_barrier",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -487,9 +651,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_errors",
+    name: "tokio_device_test_tests_sync_broadcast",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -497,9 +666,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_mpsc",
+    name: "tokio_device_test_tests_sync_errors",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -507,9 +681,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_mutex",
+    name: "tokio_device_test_tests_sync_mpsc",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -517,9 +696,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_mutex_owned",
+    name: "tokio_device_test_tests_sync_mutex",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -527,9 +711,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_notify",
+    name: "tokio_device_test_tests_sync_mutex_owned",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -537,9 +726,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_oneshot",
+    name: "tokio_device_test_tests_sync_notify",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -547,9 +741,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_rwlock",
+    name: "tokio_device_test_tests_sync_oneshot",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -557,9 +756,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_semaphore",
+    name: "tokio_device_test_tests_sync_rwlock",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -567,9 +771,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_semaphore_owned",
+    name: "tokio_device_test_tests_sync_semaphore",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -577,9 +786,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_watch",
+    name: "tokio_device_test_tests_sync_semaphore_owned",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -587,9 +801,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_abort",
+    name: "tokio_device_test_tests_sync_watch",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -597,9 +816,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_blocking",
+    name: "tokio_device_test_tests_task_abort",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -607,9 +831,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_local",
+    name: "tokio_device_test_tests_task_blocking",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -617,9 +846,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_local_set",
+    name: "tokio_device_test_tests_task_local",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -627,9 +861,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_accept",
+    name: "tokio_device_test_tests_task_local_set",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -637,9 +876,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_connect",
+    name: "tokio_device_test_tests_tcp_accept",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -647,9 +891,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_echo",
+    name: "tokio_device_test_tests_tcp_connect",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -657,9 +906,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_into_split",
+    name: "tokio_device_test_tests_tcp_echo",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -667,9 +921,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_into_std",
+    name: "tokio_device_test_tests_tcp_into_split",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -677,9 +936,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_peek",
+    name: "tokio_device_test_tests_tcp_into_std",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -687,9 +951,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_shutdown",
+    name: "tokio_device_test_tests_tcp_peek",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -697,9 +966,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_socket",
+    name: "tokio_device_test_tests_tcp_shutdown",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -707,9 +981,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_split",
+    name: "tokio_device_test_tests_tcp_socket",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -717,9 +996,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_time_rt",
+    name: "tokio_device_test_tests_tcp_split",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/tcp_split.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,
@@ -727,9 +1011,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_udp",
+    name: "tokio_device_test_tests_time_rt",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/time_rt.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_udp",
+    defaults: ["tokio_defaults_tokio"],
     srcs: ["tests/udp.rs"],
     test_options: {
         unit_test: true,
@@ -737,9 +1026,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_uds_cred",
+    name: "tokio_device_test_tests_udp",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -747,12 +1041,22 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_uds_split",
+    name: "tokio_device_test_tests_uds_cred",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/uds_cred.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"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2e7046e..6c266ef 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,417 +1,218 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "imports": [
-    {
-      "path": "external/rust/crates/futures-util"
-    },
-    {
-      "path": "external/rust/crates/tokio-test"
-    }
-  ],
   "presubmit": [
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "rustBinderTest"
+      "name": "futures-util_device_test_src_lib"
     },
     {
-      "name": "tokio_test_tests__require_full"
+      "name": "tokio-test_device_test_src_lib"
     },
     {
-      "name": "tokio_test_tests_buffered"
+      "name": "tokio-test_device_test_tests_block_on"
     },
     {
-      "name": "tokio_test_tests_io_async_fd"
+      "name": "tokio-test_device_test_tests_io"
     },
     {
-      "name": "tokio_test_tests_io_async_read"
+      "name": "tokio-test_device_test_tests_macros"
     },
     {
-      "name": "tokio_test_tests_io_chain"
+      "name": "tokio_device_test_tests__require_full"
     },
     {
-      "name": "tokio_test_tests_io_copy"
+      "name": "tokio_device_test_tests_buffered"
     },
     {
-      "name": "tokio_test_tests_io_copy_bidirectional"
+      "name": "tokio_device_test_tests_io_async_fd"
     },
     {
-      "name": "tokio_test_tests_io_driver"
+      "name": "tokio_device_test_tests_io_async_read"
     },
     {
-      "name": "tokio_test_tests_io_driver_drop"
+      "name": "tokio_device_test_tests_io_chain"
     },
     {
-      "name": "tokio_test_tests_io_lines"
+      "name": "tokio_device_test_tests_io_copy"
     },
     {
-      "name": "tokio_test_tests_io_mem_stream"
+      "name": "tokio_device_test_tests_io_copy_bidirectional"
     },
     {
-      "name": "tokio_test_tests_io_read"
+      "name": "tokio_device_test_tests_io_driver"
     },
     {
-      "name": "tokio_test_tests_io_read_buf"
+      "name": "tokio_device_test_tests_io_driver_drop"
     },
     {
-      "name": "tokio_test_tests_io_read_exact"
+      "name": "tokio_device_test_tests_io_lines"
     },
     {
-      "name": "tokio_test_tests_io_read_line"
+      "name": "tokio_device_test_tests_io_mem_stream"
     },
     {
-      "name": "tokio_test_tests_io_read_to_end"
+      "name": "tokio_device_test_tests_io_read"
     },
     {
-      "name": "tokio_test_tests_io_read_to_string"
+      "name": "tokio_device_test_tests_io_read_buf"
     },
     {
-      "name": "tokio_test_tests_io_read_until"
+      "name": "tokio_device_test_tests_io_read_exact"
     },
     {
-      "name": "tokio_test_tests_io_split"
+      "name": "tokio_device_test_tests_io_read_line"
     },
     {
-      "name": "tokio_test_tests_io_take"
+      "name": "tokio_device_test_tests_io_read_to_end"
     },
     {
-      "name": "tokio_test_tests_io_write"
+      "name": "tokio_device_test_tests_io_read_to_string"
     },
     {
-      "name": "tokio_test_tests_io_write_all"
+      "name": "tokio_device_test_tests_io_read_until"
     },
     {
-      "name": "tokio_test_tests_io_write_buf"
+      "name": "tokio_device_test_tests_io_split"
     },
     {
-      "name": "tokio_test_tests_io_write_int"
+      "name": "tokio_device_test_tests_io_take"
     },
     {
-      "name": "tokio_test_tests_macros_join"
+      "name": "tokio_device_test_tests_io_write"
     },
     {
-      "name": "tokio_test_tests_macros_pin"
+      "name": "tokio_device_test_tests_io_write_all"
     },
     {
-      "name": "tokio_test_tests_macros_select"
+      "name": "tokio_device_test_tests_io_write_buf"
     },
     {
-      "name": "tokio_test_tests_macros_test"
+      "name": "tokio_device_test_tests_io_write_int"
     },
     {
-      "name": "tokio_test_tests_macros_try_join"
+      "name": "tokio_device_test_tests_macros_join"
     },
     {
-      "name": "tokio_test_tests_net_bind_resource"
+      "name": "tokio_device_test_tests_macros_pin"
     },
     {
-      "name": "tokio_test_tests_net_lookup_host"
+      "name": "tokio_device_test_tests_macros_select"
     },
     {
-      "name": "tokio_test_tests_no_rt"
+      "name": "tokio_device_test_tests_macros_test"
     },
     {
-      "name": "tokio_test_tests_process_kill_on_drop"
+      "name": "tokio_device_test_tests_macros_try_join"
     },
     {
-      "name": "tokio_test_tests_rt_basic"
+      "name": "tokio_device_test_tests_net_bind_resource"
     },
     {
-      "name": "tokio_test_tests_rt_common"
+      "name": "tokio_device_test_tests_net_lookup_host"
     },
     {
-      "name": "tokio_test_tests_rt_threaded"
+      "name": "tokio_device_test_tests_no_rt"
     },
     {
-      "name": "tokio_test_tests_sync_barrier"
+      "name": "tokio_device_test_tests_process_kill_on_drop"
     },
     {
-      "name": "tokio_test_tests_sync_broadcast"
+      "name": "tokio_device_test_tests_rt_basic"
     },
     {
-      "name": "tokio_test_tests_sync_errors"
+      "name": "tokio_device_test_tests_rt_common"
     },
     {
-      "name": "tokio_test_tests_sync_mpsc"
+      "name": "tokio_device_test_tests_rt_threaded"
     },
     {
-      "name": "tokio_test_tests_sync_mutex"
+      "name": "tokio_device_test_tests_sync_barrier"
     },
     {
-      "name": "tokio_test_tests_sync_mutex_owned"
+      "name": "tokio_device_test_tests_sync_broadcast"
     },
     {
-      "name": "tokio_test_tests_sync_notify"
+      "name": "tokio_device_test_tests_sync_errors"
     },
     {
-      "name": "tokio_test_tests_sync_oneshot"
+      "name": "tokio_device_test_tests_sync_mpsc"
     },
     {
-      "name": "tokio_test_tests_sync_rwlock"
+      "name": "tokio_device_test_tests_sync_mutex"
     },
     {
-      "name": "tokio_test_tests_sync_semaphore"
+      "name": "tokio_device_test_tests_sync_mutex_owned"
     },
     {
-      "name": "tokio_test_tests_sync_semaphore_owned"
+      "name": "tokio_device_test_tests_sync_notify"
     },
     {
-      "name": "tokio_test_tests_sync_watch"
+      "name": "tokio_device_test_tests_sync_oneshot"
     },
     {
-      "name": "tokio_test_tests_task_abort"
+      "name": "tokio_device_test_tests_sync_rwlock"
     },
     {
-      "name": "tokio_test_tests_task_blocking"
+      "name": "tokio_device_test_tests_sync_semaphore"
     },
     {
-      "name": "tokio_test_tests_task_local"
+      "name": "tokio_device_test_tests_sync_semaphore_owned"
     },
     {
-      "name": "tokio_test_tests_task_local_set"
+      "name": "tokio_device_test_tests_sync_watch"
     },
     {
-      "name": "tokio_test_tests_tcp_accept"
+      "name": "tokio_device_test_tests_task_abort"
     },
     {
-      "name": "tokio_test_tests_tcp_connect"
+      "name": "tokio_device_test_tests_task_blocking"
     },
     {
-      "name": "tokio_test_tests_tcp_echo"
+      "name": "tokio_device_test_tests_task_local"
     },
     {
-      "name": "tokio_test_tests_tcp_into_split"
+      "name": "tokio_device_test_tests_task_local_set"
     },
     {
-      "name": "tokio_test_tests_tcp_into_std"
+      "name": "tokio_device_test_tests_tcp_accept"
     },
     {
-      "name": "tokio_test_tests_tcp_peek"
+      "name": "tokio_device_test_tests_tcp_connect"
     },
     {
-      "name": "tokio_test_tests_tcp_shutdown"
+      "name": "tokio_device_test_tests_tcp_echo"
     },
     {
-      "name": "tokio_test_tests_tcp_socket"
+      "name": "tokio_device_test_tests_tcp_into_split"
     },
     {
-      "name": "tokio_test_tests_tcp_split"
+      "name": "tokio_device_test_tests_tcp_into_std"
     },
     {
-      "name": "tokio_test_tests_time_rt"
+      "name": "tokio_device_test_tests_tcp_peek"
     },
     {
-      "name": "tokio_test_tests_udp"
+      "name": "tokio_device_test_tests_tcp_shutdown"
     },
     {
-      "name": "tokio_test_tests_uds_cred"
+      "name": "tokio_device_test_tests_tcp_socket"
     },
     {
-      "name": "tokio_test_tests_uds_split"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "doh_unit_test"
+      "name": "tokio_device_test_tests_tcp_split"
     },
     {
-      "name": "rustBinderTest"
+      "name": "tokio_device_test_tests_time_rt"
     },
     {
-      "name": "tokio_test_tests__require_full"
+      "name": "tokio_device_test_tests_udp"
     },
     {
-      "name": "tokio_test_tests_buffered"
+      "name": "tokio_device_test_tests_uds_cred"
     },
     {
-      "name": "tokio_test_tests_io_async_fd"
-    },
-    {
-      "name": "tokio_test_tests_io_async_read"
-    },
-    {
-      "name": "tokio_test_tests_io_chain"
-    },
-    {
-      "name": "tokio_test_tests_io_copy"
-    },
-    {
-      "name": "tokio_test_tests_io_copy_bidirectional"
-    },
-    {
-      "name": "tokio_test_tests_io_driver"
-    },
-    {
-      "name": "tokio_test_tests_io_driver_drop"
-    },
-    {
-      "name": "tokio_test_tests_io_lines"
-    },
-    {
-      "name": "tokio_test_tests_io_mem_stream"
-    },
-    {
-      "name": "tokio_test_tests_io_read"
-    },
-    {
-      "name": "tokio_test_tests_io_read_buf"
-    },
-    {
-      "name": "tokio_test_tests_io_read_exact"
-    },
-    {
-      "name": "tokio_test_tests_io_read_line"
-    },
-    {
-      "name": "tokio_test_tests_io_read_to_end"
-    },
-    {
-      "name": "tokio_test_tests_io_read_to_string"
-    },
-    {
-      "name": "tokio_test_tests_io_read_until"
-    },
-    {
-      "name": "tokio_test_tests_io_split"
-    },
-    {
-      "name": "tokio_test_tests_io_take"
-    },
-    {
-      "name": "tokio_test_tests_io_write"
-    },
-    {
-      "name": "tokio_test_tests_io_write_all"
-    },
-    {
-      "name": "tokio_test_tests_io_write_buf"
-    },
-    {
-      "name": "tokio_test_tests_io_write_int"
-    },
-    {
-      "name": "tokio_test_tests_macros_join"
-    },
-    {
-      "name": "tokio_test_tests_macros_pin"
-    },
-    {
-      "name": "tokio_test_tests_macros_select"
-    },
-    {
-      "name": "tokio_test_tests_macros_test"
-    },
-    {
-      "name": "tokio_test_tests_macros_try_join"
-    },
-    {
-      "name": "tokio_test_tests_net_bind_resource"
-    },
-    {
-      "name": "tokio_test_tests_net_lookup_host"
-    },
-    {
-      "name": "tokio_test_tests_no_rt"
-    },
-    {
-      "name": "tokio_test_tests_process_kill_on_drop"
-    },
-    {
-      "name": "tokio_test_tests_rt_basic"
-    },
-    {
-      "name": "tokio_test_tests_rt_common"
-    },
-    {
-      "name": "tokio_test_tests_rt_threaded"
-    },
-    {
-      "name": "tokio_test_tests_sync_barrier"
-    },
-    {
-      "name": "tokio_test_tests_sync_broadcast"
-    },
-    {
-      "name": "tokio_test_tests_sync_errors"
-    },
-    {
-      "name": "tokio_test_tests_sync_mpsc"
-    },
-    {
-      "name": "tokio_test_tests_sync_mutex"
-    },
-    {
-      "name": "tokio_test_tests_sync_mutex_owned"
-    },
-    {
-      "name": "tokio_test_tests_sync_notify"
-    },
-    {
-      "name": "tokio_test_tests_sync_oneshot"
-    },
-    {
-      "name": "tokio_test_tests_sync_rwlock"
-    },
-    {
-      "name": "tokio_test_tests_sync_semaphore"
-    },
-    {
-      "name": "tokio_test_tests_sync_semaphore_owned"
-    },
-    {
-      "name": "tokio_test_tests_sync_watch"
-    },
-    {
-      "name": "tokio_test_tests_task_abort"
-    },
-    {
-      "name": "tokio_test_tests_task_blocking"
-    },
-    {
-      "name": "tokio_test_tests_task_local"
-    },
-    {
-      "name": "tokio_test_tests_task_local_set"
-    },
-    {
-      "name": "tokio_test_tests_tcp_accept"
-    },
-    {
-      "name": "tokio_test_tests_tcp_connect"
-    },
-    {
-      "name": "tokio_test_tests_tcp_echo"
-    },
-    {
-      "name": "tokio_test_tests_tcp_into_split"
-    },
-    {
-      "name": "tokio_test_tests_tcp_into_std"
-    },
-    {
-      "name": "tokio_test_tests_tcp_peek"
-    },
-    {
-      "name": "tokio_test_tests_tcp_shutdown"
-    },
-    {
-      "name": "tokio_test_tests_tcp_socket"
-    },
-    {
-      "name": "tokio_test_tests_tcp_split"
-    },
-    {
-      "name": "tokio_test_tests_time_rt"
-    },
-    {
-      "name": "tokio_test_tests_udp"
-    },
-    {
-      "name": "tokio_test_tests_uds_cred"
-    },
-    {
-      "name": "tokio_test_tests_uds_split"
+      "name": "tokio_device_test_tests_uds_split"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 75772f0..c715d16 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,14 +1,11 @@
 {
-  "add-toplevel-block": "cargo2android_tests.bp",
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.resolv",
-    "com.android.uwb"
-  ],
-  "device": true,
-  "features": "io-util,macros,rt-multi-thread,sync,net,fs,time",
-  "min-sdk-version": "29",
-  "vendor-available": true,
-  "run": true
-}
+    "add-toplevel-block": "cargo2android_tests.bp",
+    "apex-available": [
+      "//apex_available:platform",
+      "com.android.resolv"
+    ],
+    "min_sdk_version": "29",
+    "features": "io-util,macros,rt-multi-thread,sync,net,fs,time",
+    "device": true,
+    "run": true
+}
\ No newline at end of file
diff --git a/cargo2android_tests.bp b/cargo2android_tests.bp
index 809c899..763471b 100644
--- a/cargo2android_tests.bp
+++ b/cargo2android_tests.bp
@@ -1,7 +1,6 @@
 rust_defaults {
     name: "tokio_defaults_tokio",
     crate_name: "tokio",
-    cargo_env_compat: true,
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -41,10 +40,9 @@
     proc_macros: ["libtokio_macros"],
 }
 
-rust_test {
-    name: "tokio_test_tests__require_full",
+rust_test_host {
+    name: "tokio_host_test_tests__require_full",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
     srcs: ["tests/_require_full.rs"],
     test_options: {
         unit_test: true,
@@ -52,9 +50,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_buffered",
+    name: "tokio_device_test_tests__require_full",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/_require_full.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_buffered",
+    defaults: ["tokio_defaults_tokio"],
     srcs: ["tests/buffered.rs"],
     test_options: {
         unit_test: true,
@@ -62,9 +65,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_async_fd",
+    name: "tokio_device_test_tests_buffered",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/buffered.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,
@@ -72,9 +80,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_async_read",
+    name: "tokio_device_test_tests_io_async_fd",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -82,9 +95,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_chain",
+    name: "tokio_device_test_tests_io_async_read",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -92,9 +110,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_copy",
+    name: "tokio_device_test_tests_io_chain",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -102,9 +125,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_copy_bidirectional",
+    name: "tokio_device_test_tests_io_copy",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/io_copy.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_io_copy_bidirectional",
+    defaults: ["tokio_defaults_tokio"],
     srcs: ["tests/io_copy_bidirectional.rs"],
     test_options: {
         unit_test: true,
@@ -112,9 +140,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_driver",
+    name: "tokio_device_test_tests_io_copy_bidirectional",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/io_copy_bidirectional.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,
@@ -122,9 +155,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_driver_drop",
+    name: "tokio_device_test_tests_io_driver",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -132,9 +170,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_lines",
+    name: "tokio_device_test_tests_io_driver_drop",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -142,9 +185,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_mem_stream",
+    name: "tokio_device_test_tests_io_lines",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -152,9 +200,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read",
+    name: "tokio_device_test_tests_io_mem_stream",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -162,9 +215,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_buf",
+    name: "tokio_device_test_tests_io_read",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -172,9 +230,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_exact",
+    name: "tokio_device_test_tests_io_read_buf",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -182,9 +245,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_line",
+    name: "tokio_device_test_tests_io_read_exact",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -192,9 +260,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_to_end",
+    name: "tokio_device_test_tests_io_read_line",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -202,9 +275,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_to_string",
+    name: "tokio_device_test_tests_io_read_to_end",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -212,9 +290,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_read_until",
+    name: "tokio_device_test_tests_io_read_to_string",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -222,9 +305,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_split",
+    name: "tokio_device_test_tests_io_read_until",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -232,9 +320,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_take",
+    name: "tokio_device_test_tests_io_split",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -242,9 +335,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write",
+    name: "tokio_device_test_tests_io_take",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -252,9 +350,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write_all",
+    name: "tokio_device_test_tests_io_write",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -262,9 +365,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write_buf",
+    name: "tokio_device_test_tests_io_write_all",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -272,9 +380,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_io_write_int",
+    name: "tokio_device_test_tests_io_write_buf",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -282,9 +395,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_join",
+    name: "tokio_device_test_tests_io_write_int",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -292,9 +410,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_pin",
+    name: "tokio_device_test_tests_macros_join",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -302,9 +425,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_select",
+    name: "tokio_device_test_tests_macros_pin",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -312,9 +440,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_test",
+    name: "tokio_device_test_tests_macros_select",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -322,9 +455,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_macros_try_join",
+    name: "tokio_device_test_tests_macros_test",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -332,9 +470,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_net_bind_resource",
+    name: "tokio_device_test_tests_macros_try_join",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -342,9 +485,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_net_lookup_host",
+    name: "tokio_device_test_tests_net_bind_resource",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -352,9 +500,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_no_rt",
+    name: "tokio_device_test_tests_net_lookup_host",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -362,9 +515,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_process_kill_on_drop",
+    name: "tokio_device_test_tests_no_rt",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/no_rt.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,
@@ -372,9 +530,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_rt_basic",
+    name: "tokio_device_test_tests_process_kill_on_drop",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/process_kill_on_drop.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,
@@ -382,9 +545,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_rt_common",
+    name: "tokio_device_test_tests_rt_basic",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -392,9 +560,15 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_rt_threaded",
+    name: "tokio_device_test_tests_rt_common",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -402,9 +576,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_barrier",
+    name: "tokio_device_test_tests_rt_threaded",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/rt_threaded.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,
@@ -412,9 +591,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_broadcast",
+    name: "tokio_device_test_tests_sync_barrier",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -422,9 +606,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_errors",
+    name: "tokio_device_test_tests_sync_broadcast",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -432,9 +621,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_mpsc",
+    name: "tokio_device_test_tests_sync_errors",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -442,9 +636,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_mutex",
+    name: "tokio_device_test_tests_sync_mpsc",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -452,9 +651,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_mutex_owned",
+    name: "tokio_device_test_tests_sync_mutex",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -462,9 +666,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_notify",
+    name: "tokio_device_test_tests_sync_mutex_owned",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -472,9 +681,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_oneshot",
+    name: "tokio_device_test_tests_sync_notify",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -482,9 +696,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_rwlock",
+    name: "tokio_device_test_tests_sync_oneshot",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -492,9 +711,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_semaphore",
+    name: "tokio_device_test_tests_sync_rwlock",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -502,9 +726,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_semaphore_owned",
+    name: "tokio_device_test_tests_sync_semaphore",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -512,9 +741,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_watch",
+    name: "tokio_device_test_tests_sync_semaphore_owned",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -522,9 +756,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_abort",
+    name: "tokio_device_test_tests_sync_watch",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -532,9 +771,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_blocking",
+    name: "tokio_device_test_tests_task_abort",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -542,9 +786,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_local",
+    name: "tokio_device_test_tests_task_blocking",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -552,9 +801,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_task_local_set",
+    name: "tokio_device_test_tests_task_local",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -562,9 +816,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_accept",
+    name: "tokio_device_test_tests_task_local_set",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -572,9 +831,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_connect",
+    name: "tokio_device_test_tests_tcp_accept",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -582,9 +846,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_echo",
+    name: "tokio_device_test_tests_tcp_connect",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -592,9 +861,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_into_split",
+    name: "tokio_device_test_tests_tcp_echo",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -602,9 +876,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_into_std",
+    name: "tokio_device_test_tests_tcp_into_split",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -612,9 +891,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_peek",
+    name: "tokio_device_test_tests_tcp_into_std",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -622,9 +906,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_shutdown",
+    name: "tokio_device_test_tests_tcp_peek",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -632,9 +921,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_socket",
+    name: "tokio_device_test_tests_tcp_shutdown",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -642,9 +936,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_tcp_split",
+    name: "tokio_device_test_tests_tcp_socket",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -652,9 +951,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_time_rt",
+    name: "tokio_device_test_tests_tcp_split",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/tcp_split.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,
@@ -662,9 +966,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_udp",
+    name: "tokio_device_test_tests_time_rt",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/time_rt.rs"],
+}
+
+rust_test_host {
+    name: "tokio_host_test_tests_udp",
+    defaults: ["tokio_defaults_tokio"],
     srcs: ["tests/udp.rs"],
     test_options: {
         unit_test: true,
@@ -672,9 +981,14 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_uds_cred",
+    name: "tokio_device_test_tests_udp",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    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,
@@ -682,11 +996,22 @@
 }
 
 rust_test {
-    name: "tokio_test_tests_uds_split",
+    name: "tokio_device_test_tests_uds_cred",
     defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
+    srcs: ["tests/uds_cred.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"],
+}
\ No newline at end of file