Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: a1ae1fbcb1 am: 27af762298

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/1912691

Change-Id: Iecca7f2933bd660503c1293865c7e61f05df3a93

4 files changed, 543 insertions, 993 deletions

diff --git a/Android.bp b/Android.bp
index 7c4688c..b2a194f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,7 @@ rust_library {
 rust_defaults {
     name: "tokio_defaults_tokio",
     crate_name: "tokio",
+    cargo_env_compat: true,
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -103,9 +104,10 @@ rust_defaults {
     proc_macros: ["libtokio_macros"],
 }
 
-rust_test_host {
-    name: "tokio_host_test_tests__require_full",
+rust_test {
+    name: "tokio_test_tests__require_full",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/_require_full.rs"],
     test_options: {
         unit_test: true,
@@ -113,14 +115,9 @@ rust_test_host {
 }
 
 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_buffered",
+    name: "tokio_test_tests_buffered",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/buffered.rs"],
     test_options: {
         unit_test: true,
@@ -128,14 +125,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "tokio_device_test_tests_buffered",
-    defaults: ["tokio_defaults_tokio"],
-    srcs: ["tests/buffered.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_io_async_fd",
+    name: "tokio_test_tests_io_async_fd",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_async_fd.rs"],
     test_options: {
         unit_test: true,
@@ -143,14 +135,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_async_read",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_async_read.rs"],
     test_options: {
         unit_test: true,
@@ -158,14 +145,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_chain",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_chain.rs"],
     test_options: {
         unit_test: true,
@@ -173,14 +155,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_copy",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_copy.rs"],
     test_options: {
         unit_test: true,
@@ -188,14 +165,9 @@ rust_test_host {
 }
 
 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_copy_bidirectional",
+    name: "tokio_test_tests_io_copy_bidirectional",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_copy_bidirectional.rs"],
     test_options: {
         unit_test: true,
@@ -203,14 +175,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "tokio_device_test_tests_io_copy_bidirectional",
-    defaults: ["tokio_defaults_tokio"],
-    srcs: ["tests/io_copy_bidirectional.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_io_driver",
+    name: "tokio_test_tests_io_driver",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_driver.rs"],
     test_options: {
         unit_test: true,
@@ -218,14 +185,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_driver_drop",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_driver_drop.rs"],
     test_options: {
         unit_test: true,
@@ -233,14 +195,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_lines",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_lines.rs"],
     test_options: {
         unit_test: true,
@@ -248,14 +205,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_mem_stream",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_mem_stream.rs"],
     test_options: {
         unit_test: true,
@@ -263,14 +215,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read.rs"],
     test_options: {
         unit_test: true,
@@ -278,14 +225,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_buf",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_buf.rs"],
     test_options: {
         unit_test: true,
@@ -293,14 +235,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_exact",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_exact.rs"],
     test_options: {
         unit_test: true,
@@ -308,14 +245,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_line",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_line.rs"],
     test_options: {
         unit_test: true,
@@ -323,14 +255,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_to_end",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_to_end.rs"],
     test_options: {
         unit_test: true,
@@ -338,14 +265,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_to_string",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_to_string.rs"],
     test_options: {
         unit_test: true,
@@ -353,14 +275,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_until",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_until.rs"],
     test_options: {
         unit_test: true,
@@ -368,14 +285,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_split.rs"],
     test_options: {
         unit_test: true,
@@ -383,14 +295,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_take",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_take.rs"],
     test_options: {
         unit_test: true,
@@ -398,14 +305,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write.rs"],
     test_options: {
         unit_test: true,
@@ -413,14 +315,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write_all",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write_all.rs"],
     test_options: {
         unit_test: true,
@@ -428,14 +325,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write_buf",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write_buf.rs"],
     test_options: {
         unit_test: true,
@@ -443,14 +335,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write_int",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write_int.rs"],
     test_options: {
         unit_test: true,
@@ -458,14 +345,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_join",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_join.rs"],
     test_options: {
         unit_test: true,
@@ -473,14 +355,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_pin",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_pin.rs"],
     test_options: {
         unit_test: true,
@@ -488,14 +365,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_select",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_select.rs"],
     test_options: {
         unit_test: true,
@@ -503,14 +375,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_test",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_test.rs"],
     test_options: {
         unit_test: true,
@@ -518,14 +385,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_try_join",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_try_join.rs"],
     test_options: {
         unit_test: true,
@@ -533,14 +395,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_net_bind_resource",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/net_bind_resource.rs"],
     test_options: {
         unit_test: true,
@@ -548,14 +405,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_net_lookup_host",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/net_lookup_host.rs"],
     test_options: {
         unit_test: true,
@@ -563,14 +415,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_no_rt",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/no_rt.rs"],
     test_options: {
         unit_test: true,
@@ -578,14 +425,9 @@ rust_test_host {
 }
 
 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_kill_on_drop",
+    name: "tokio_test_tests_process_kill_on_drop",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/process_kill_on_drop.rs"],
     test_options: {
         unit_test: true,
@@ -593,14 +435,9 @@ rust_test_host {
 }
 
 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_rt_basic",
+    name: "tokio_test_tests_rt_basic",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/rt_basic.rs"],
     test_options: {
         unit_test: true,
@@ -608,14 +445,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_rt_common",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/rt_common.rs"],
     test_options: {
         unit_test: true,
@@ -623,15 +455,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_rt_threaded",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/rt_threaded.rs"],
     test_options: {
         unit_test: true,
@@ -639,14 +465,9 @@ rust_test_host {
 }
 
 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_sync_barrier",
+    name: "tokio_test_tests_sync_barrier",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_barrier.rs"],
     test_options: {
         unit_test: true,
@@ -654,14 +475,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_broadcast",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_broadcast.rs"],
     test_options: {
         unit_test: true,
@@ -669,14 +485,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_errors",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_errors.rs"],
     test_options: {
         unit_test: true,
@@ -684,14 +495,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_mpsc",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_mpsc.rs"],
     test_options: {
         unit_test: true,
@@ -699,14 +505,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_mutex",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_mutex.rs"],
     test_options: {
         unit_test: true,
@@ -714,14 +515,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_mutex_owned",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_mutex_owned.rs"],
     test_options: {
         unit_test: true,
@@ -729,14 +525,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_notify",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_notify.rs"],
     test_options: {
         unit_test: true,
@@ -744,14 +535,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_oneshot",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_oneshot.rs"],
     test_options: {
         unit_test: true,
@@ -759,14 +545,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_rwlock",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_rwlock.rs"],
     test_options: {
         unit_test: true,
@@ -774,14 +555,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_semaphore",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_semaphore.rs"],
     test_options: {
         unit_test: true,
@@ -789,14 +565,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_semaphore_owned",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_semaphore_owned.rs"],
     test_options: {
         unit_test: true,
@@ -804,14 +575,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_watch",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_watch.rs"],
     test_options: {
         unit_test: true,
@@ -819,14 +585,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_abort",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_abort.rs"],
     test_options: {
         unit_test: true,
@@ -834,14 +595,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_blocking",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_blocking.rs"],
     test_options: {
         unit_test: true,
@@ -849,14 +605,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_local",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_local.rs"],
     test_options: {
         unit_test: true,
@@ -864,14 +615,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_local_set",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_local_set.rs"],
     test_options: {
         unit_test: true,
@@ -879,14 +625,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_accept",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_accept.rs"],
     test_options: {
         unit_test: true,
@@ -894,14 +635,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_connect",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_connect.rs"],
     test_options: {
         unit_test: true,
@@ -909,14 +645,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_echo",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_echo.rs"],
     test_options: {
         unit_test: true,
@@ -924,14 +655,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_into_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_into_split.rs"],
     test_options: {
         unit_test: true,
@@ -939,14 +665,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_into_std",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_into_std.rs"],
     test_options: {
         unit_test: true,
@@ -954,14 +675,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_peek",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_peek.rs"],
     test_options: {
         unit_test: true,
@@ -969,14 +685,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_shutdown",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_shutdown.rs"],
     test_options: {
         unit_test: true,
@@ -984,14 +695,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_socket",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_socket.rs"],
     test_options: {
         unit_test: true,
@@ -999,14 +705,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_split.rs"],
     test_options: {
         unit_test: true,
@@ -1014,14 +715,9 @@ rust_test_host {
 }
 
 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_time_rt",
+    name: "tokio_test_tests_time_rt",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/time_rt.rs"],
     test_options: {
         unit_test: true,
@@ -1029,14 +725,9 @@ rust_test_host {
 }
 
 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_udp",
+    name: "tokio_test_tests_udp",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/udp.rs"],
     test_options: {
         unit_test: true,
@@ -1044,14 +735,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_uds_cred",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/uds_cred.rs"],
     test_options: {
         unit_test: true,
@@ -1059,22 +745,12 @@ rust_test_host {
 }
 
 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_split",
+    name: "tokio_test_tests_uds_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     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 6c266ef..2e7046e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,218 +1,417 @@
 // 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": "futures-util_device_test_src_lib"
+      "name": "rustBinderTest"
+    },
+    {
+      "name": "tokio_test_tests__require_full"
+    },
+    {
+      "name": "tokio_test_tests_buffered"
+    },
+    {
+      "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_device_test_src_lib"
+      "name": "tokio_test_tests_no_rt"
     },
     {
-      "name": "tokio-test_device_test_tests_block_on"
+      "name": "tokio_test_tests_process_kill_on_drop"
     },
     {
-      "name": "tokio-test_device_test_tests_io"
+      "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"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "doh_unit_test"
     },
     {
-      "name": "tokio-test_device_test_tests_macros"
+      "name": "rustBinderTest"
     },
     {
-      "name": "tokio_device_test_tests__require_full"
+      "name": "tokio_test_tests__require_full"
     },
     {
-      "name": "tokio_device_test_tests_buffered"
+      "name": "tokio_test_tests_buffered"
     },
     {
-      "name": "tokio_device_test_tests_io_async_fd"
+      "name": "tokio_test_tests_io_async_fd"
     },
     {
-      "name": "tokio_device_test_tests_io_async_read"
+      "name": "tokio_test_tests_io_async_read"
     },
     {
-      "name": "tokio_device_test_tests_io_chain"
+      "name": "tokio_test_tests_io_chain"
     },
     {
-      "name": "tokio_device_test_tests_io_copy"
+      "name": "tokio_test_tests_io_copy"
     },
     {
-      "name": "tokio_device_test_tests_io_copy_bidirectional"
+      "name": "tokio_test_tests_io_copy_bidirectional"
     },
     {
-      "name": "tokio_device_test_tests_io_driver"
+      "name": "tokio_test_tests_io_driver"
     },
     {
-      "name": "tokio_device_test_tests_io_driver_drop"
+      "name": "tokio_test_tests_io_driver_drop"
     },
     {
-      "name": "tokio_device_test_tests_io_lines"
+      "name": "tokio_test_tests_io_lines"
     },
     {
-      "name": "tokio_device_test_tests_io_mem_stream"
+      "name": "tokio_test_tests_io_mem_stream"
     },
     {
-      "name": "tokio_device_test_tests_io_read"
+      "name": "tokio_test_tests_io_read"
     },
     {
-      "name": "tokio_device_test_tests_io_read_buf"
+      "name": "tokio_test_tests_io_read_buf"
     },
     {
-      "name": "tokio_device_test_tests_io_read_exact"
+      "name": "tokio_test_tests_io_read_exact"
     },
     {
-      "name": "tokio_device_test_tests_io_read_line"
+      "name": "tokio_test_tests_io_read_line"
     },
     {
-      "name": "tokio_device_test_tests_io_read_to_end"
+      "name": "tokio_test_tests_io_read_to_end"
     },
     {
-      "name": "tokio_device_test_tests_io_read_to_string"
+      "name": "tokio_test_tests_io_read_to_string"
     },
     {
-      "name": "tokio_device_test_tests_io_read_until"
+      "name": "tokio_test_tests_io_read_until"
     },
     {
-      "name": "tokio_device_test_tests_io_split"
+      "name": "tokio_test_tests_io_split"
     },
     {
-      "name": "tokio_device_test_tests_io_take"
+      "name": "tokio_test_tests_io_take"
     },
     {
-      "name": "tokio_device_test_tests_io_write"
+      "name": "tokio_test_tests_io_write"
     },
     {
-      "name": "tokio_device_test_tests_io_write_all"
+      "name": "tokio_test_tests_io_write_all"
     },
     {
-      "name": "tokio_device_test_tests_io_write_buf"
+      "name": "tokio_test_tests_io_write_buf"
     },
     {
-      "name": "tokio_device_test_tests_io_write_int"
+      "name": "tokio_test_tests_io_write_int"
     },
     {
-      "name": "tokio_device_test_tests_macros_join"
+      "name": "tokio_test_tests_macros_join"
     },
     {
-      "name": "tokio_device_test_tests_macros_pin"
+      "name": "tokio_test_tests_macros_pin"
     },
     {
-      "name": "tokio_device_test_tests_macros_select"
+      "name": "tokio_test_tests_macros_select"
     },
     {
-      "name": "tokio_device_test_tests_macros_test"
+      "name": "tokio_test_tests_macros_test"
     },
     {
-      "name": "tokio_device_test_tests_macros_try_join"
+      "name": "tokio_test_tests_macros_try_join"
     },
     {
-      "name": "tokio_device_test_tests_net_bind_resource"
+      "name": "tokio_test_tests_net_bind_resource"
     },
     {
-      "name": "tokio_device_test_tests_net_lookup_host"
+      "name": "tokio_test_tests_net_lookup_host"
     },
     {
-      "name": "tokio_device_test_tests_no_rt"
+      "name": "tokio_test_tests_no_rt"
     },
     {
-      "name": "tokio_device_test_tests_process_kill_on_drop"
+      "name": "tokio_test_tests_process_kill_on_drop"
     },
     {
-      "name": "tokio_device_test_tests_rt_basic"
+      "name": "tokio_test_tests_rt_basic"
     },
     {
-      "name": "tokio_device_test_tests_rt_common"
+      "name": "tokio_test_tests_rt_common"
     },
     {
-      "name": "tokio_device_test_tests_rt_threaded"
+      "name": "tokio_test_tests_rt_threaded"
     },
     {
-      "name": "tokio_device_test_tests_sync_barrier"
+      "name": "tokio_test_tests_sync_barrier"
     },
     {
-      "name": "tokio_device_test_tests_sync_broadcast"
+      "name": "tokio_test_tests_sync_broadcast"
     },
     {
-      "name": "tokio_device_test_tests_sync_errors"
+      "name": "tokio_test_tests_sync_errors"
     },
     {
-      "name": "tokio_device_test_tests_sync_mpsc"
+      "name": "tokio_test_tests_sync_mpsc"
     },
     {
-      "name": "tokio_device_test_tests_sync_mutex"
+      "name": "tokio_test_tests_sync_mutex"
     },
     {
-      "name": "tokio_device_test_tests_sync_mutex_owned"
+      "name": "tokio_test_tests_sync_mutex_owned"
     },
     {
-      "name": "tokio_device_test_tests_sync_notify"
+      "name": "tokio_test_tests_sync_notify"
     },
     {
-      "name": "tokio_device_test_tests_sync_oneshot"
+      "name": "tokio_test_tests_sync_oneshot"
     },
     {
-      "name": "tokio_device_test_tests_sync_rwlock"
+      "name": "tokio_test_tests_sync_rwlock"
     },
     {
-      "name": "tokio_device_test_tests_sync_semaphore"
+      "name": "tokio_test_tests_sync_semaphore"
     },
     {
-      "name": "tokio_device_test_tests_sync_semaphore_owned"
+      "name": "tokio_test_tests_sync_semaphore_owned"
     },
     {
-      "name": "tokio_device_test_tests_sync_watch"
+      "name": "tokio_test_tests_sync_watch"
     },
     {
-      "name": "tokio_device_test_tests_task_abort"
+      "name": "tokio_test_tests_task_abort"
     },
     {
-      "name": "tokio_device_test_tests_task_blocking"
+      "name": "tokio_test_tests_task_blocking"
     },
     {
-      "name": "tokio_device_test_tests_task_local"
+      "name": "tokio_test_tests_task_local"
     },
     {
-      "name": "tokio_device_test_tests_task_local_set"
+      "name": "tokio_test_tests_task_local_set"
     },
     {
-      "name": "tokio_device_test_tests_tcp_accept"
+      "name": "tokio_test_tests_tcp_accept"
     },
     {
-      "name": "tokio_device_test_tests_tcp_connect"
+      "name": "tokio_test_tests_tcp_connect"
     },
     {
-      "name": "tokio_device_test_tests_tcp_echo"
+      "name": "tokio_test_tests_tcp_echo"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_split"
+      "name": "tokio_test_tests_tcp_into_split"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_std"
+      "name": "tokio_test_tests_tcp_into_std"
     },
     {
-      "name": "tokio_device_test_tests_tcp_peek"
+      "name": "tokio_test_tests_tcp_peek"
     },
     {
-      "name": "tokio_device_test_tests_tcp_shutdown"
+      "name": "tokio_test_tests_tcp_shutdown"
     },
     {
-      "name": "tokio_device_test_tests_tcp_socket"
+      "name": "tokio_test_tests_tcp_socket"
     },
     {
-      "name": "tokio_device_test_tests_tcp_split"
+      "name": "tokio_test_tests_tcp_split"
     },
     {
-      "name": "tokio_device_test_tests_time_rt"
+      "name": "tokio_test_tests_time_rt"
     },
     {
-      "name": "tokio_device_test_tests_udp"
+      "name": "tokio_test_tests_udp"
     },
     {
-      "name": "tokio_device_test_tests_uds_cred"
+      "name": "tokio_test_tests_uds_cred"
     },
     {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "tokio_test_tests_uds_split"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 439011b..b13994f 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,12 +1,12 @@
 {
-    "add-toplevel-block": "cargo2android_tests.bp",
-    "apex-available": [
-      "//apex_available:platform",
-      "com.android.resolv",
-      "com.android.uwb"
-    ],
-    "min_sdk_version": "29",
-    "features": "io-util,macros,rt-multi-thread,sync,net,fs,time",
-    "device": true,
-    "run": true
+  "add-toplevel-block": "cargo2android_tests.bp",
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv",
+    "com.android.uwb"
+  ],
+  "device": true,
+  "features": "io-util,macros,rt-multi-thread,sync,net,fs,time",
+  "min-sdk-version": "29",
+  "run": true
 }
\ No newline at end of file
diff --git a/cargo2android_tests.bp b/cargo2android_tests.bp
index 763471b..809c899 100644
--- a/cargo2android_tests.bp
+++ b/cargo2android_tests.bp
@@ -1,6 +1,7 @@
 rust_defaults {
     name: "tokio_defaults_tokio",
     crate_name: "tokio",
+    cargo_env_compat: true,
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -40,9 +41,10 @@ rust_defaults {
     proc_macros: ["libtokio_macros"],
 }
 
-rust_test_host {
-    name: "tokio_host_test_tests__require_full",
+rust_test {
+    name: "tokio_test_tests__require_full",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/_require_full.rs"],
     test_options: {
         unit_test: true,
@@ -50,14 +52,9 @@ rust_test_host {
 }
 
 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_buffered",
+    name: "tokio_test_tests_buffered",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/buffered.rs"],
     test_options: {
         unit_test: true,
@@ -65,14 +62,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "tokio_device_test_tests_buffered",
-    defaults: ["tokio_defaults_tokio"],
-    srcs: ["tests/buffered.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_io_async_fd",
+    name: "tokio_test_tests_io_async_fd",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_async_fd.rs"],
     test_options: {
         unit_test: true,
@@ -80,14 +72,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_async_read",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_async_read.rs"],
     test_options: {
         unit_test: true,
@@ -95,14 +82,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_chain",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_chain.rs"],
     test_options: {
         unit_test: true,
@@ -110,14 +92,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_copy",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_copy.rs"],
     test_options: {
         unit_test: true,
@@ -125,14 +102,9 @@ rust_test_host {
 }
 
 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_copy_bidirectional",
+    name: "tokio_test_tests_io_copy_bidirectional",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_copy_bidirectional.rs"],
     test_options: {
         unit_test: true,
@@ -140,14 +112,9 @@ rust_test_host {
 }
 
 rust_test {
-    name: "tokio_device_test_tests_io_copy_bidirectional",
-    defaults: ["tokio_defaults_tokio"],
-    srcs: ["tests/io_copy_bidirectional.rs"],
-}
-
-rust_test_host {
-    name: "tokio_host_test_tests_io_driver",
+    name: "tokio_test_tests_io_driver",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_driver.rs"],
     test_options: {
         unit_test: true,
@@ -155,14 +122,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_driver_drop",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_driver_drop.rs"],
     test_options: {
         unit_test: true,
@@ -170,14 +132,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_lines",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_lines.rs"],
     test_options: {
         unit_test: true,
@@ -185,14 +142,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_mem_stream",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_mem_stream.rs"],
     test_options: {
         unit_test: true,
@@ -200,14 +152,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read.rs"],
     test_options: {
         unit_test: true,
@@ -215,14 +162,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_buf",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_buf.rs"],
     test_options: {
         unit_test: true,
@@ -230,14 +172,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_exact",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_exact.rs"],
     test_options: {
         unit_test: true,
@@ -245,14 +182,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_line",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_line.rs"],
     test_options: {
         unit_test: true,
@@ -260,14 +192,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_to_end",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_to_end.rs"],
     test_options: {
         unit_test: true,
@@ -275,14 +202,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_to_string",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_to_string.rs"],
     test_options: {
         unit_test: true,
@@ -290,14 +212,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_read_until",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_read_until.rs"],
     test_options: {
         unit_test: true,
@@ -305,14 +222,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_split.rs"],
     test_options: {
         unit_test: true,
@@ -320,14 +232,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_take",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_take.rs"],
     test_options: {
         unit_test: true,
@@ -335,14 +242,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write.rs"],
     test_options: {
         unit_test: true,
@@ -350,14 +252,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write_all",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write_all.rs"],
     test_options: {
         unit_test: true,
@@ -365,14 +262,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write_buf",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write_buf.rs"],
     test_options: {
         unit_test: true,
@@ -380,14 +272,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_io_write_int",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/io_write_int.rs"],
     test_options: {
         unit_test: true,
@@ -395,14 +282,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_join",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_join.rs"],
     test_options: {
         unit_test: true,
@@ -410,14 +292,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_pin",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_pin.rs"],
     test_options: {
         unit_test: true,
@@ -425,14 +302,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_select",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_select.rs"],
     test_options: {
         unit_test: true,
@@ -440,14 +312,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_test",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_test.rs"],
     test_options: {
         unit_test: true,
@@ -455,14 +322,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_macros_try_join",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/macros_try_join.rs"],
     test_options: {
         unit_test: true,
@@ -470,14 +332,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_net_bind_resource",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/net_bind_resource.rs"],
     test_options: {
         unit_test: true,
@@ -485,14 +342,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_net_lookup_host",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/net_lookup_host.rs"],
     test_options: {
         unit_test: true,
@@ -500,14 +352,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_no_rt",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/no_rt.rs"],
     test_options: {
         unit_test: true,
@@ -515,14 +362,9 @@ rust_test_host {
 }
 
 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_kill_on_drop",
+    name: "tokio_test_tests_process_kill_on_drop",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/process_kill_on_drop.rs"],
     test_options: {
         unit_test: true,
@@ -530,14 +372,9 @@ rust_test_host {
 }
 
 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_rt_basic",
+    name: "tokio_test_tests_rt_basic",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/rt_basic.rs"],
     test_options: {
         unit_test: true,
@@ -545,14 +382,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_rt_common",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/rt_common.rs"],
     test_options: {
         unit_test: true,
@@ -560,15 +392,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_rt_threaded",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/rt_threaded.rs"],
     test_options: {
         unit_test: true,
@@ -576,14 +402,9 @@ rust_test_host {
 }
 
 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_sync_barrier",
+    name: "tokio_test_tests_sync_barrier",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_barrier.rs"],
     test_options: {
         unit_test: true,
@@ -591,14 +412,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_broadcast",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_broadcast.rs"],
     test_options: {
         unit_test: true,
@@ -606,14 +422,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_errors",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_errors.rs"],
     test_options: {
         unit_test: true,
@@ -621,14 +432,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_mpsc",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_mpsc.rs"],
     test_options: {
         unit_test: true,
@@ -636,14 +442,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_mutex",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_mutex.rs"],
     test_options: {
         unit_test: true,
@@ -651,14 +452,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_mutex_owned",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_mutex_owned.rs"],
     test_options: {
         unit_test: true,
@@ -666,14 +462,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_notify",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_notify.rs"],
     test_options: {
         unit_test: true,
@@ -681,14 +472,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_oneshot",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_oneshot.rs"],
     test_options: {
         unit_test: true,
@@ -696,14 +482,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_rwlock",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_rwlock.rs"],
     test_options: {
         unit_test: true,
@@ -711,14 +492,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_semaphore",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_semaphore.rs"],
     test_options: {
         unit_test: true,
@@ -726,14 +502,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_semaphore_owned",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_semaphore_owned.rs"],
     test_options: {
         unit_test: true,
@@ -741,14 +512,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_sync_watch",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/sync_watch.rs"],
     test_options: {
         unit_test: true,
@@ -756,14 +522,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_abort",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_abort.rs"],
     test_options: {
         unit_test: true,
@@ -771,14 +532,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_blocking",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_blocking.rs"],
     test_options: {
         unit_test: true,
@@ -786,14 +542,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_local",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_local.rs"],
     test_options: {
         unit_test: true,
@@ -801,14 +552,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_task_local_set",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/task_local_set.rs"],
     test_options: {
         unit_test: true,
@@ -816,14 +562,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_accept",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_accept.rs"],
     test_options: {
         unit_test: true,
@@ -831,14 +572,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_connect",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_connect.rs"],
     test_options: {
         unit_test: true,
@@ -846,14 +582,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_echo",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_echo.rs"],
     test_options: {
         unit_test: true,
@@ -861,14 +592,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_into_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_into_split.rs"],
     test_options: {
         unit_test: true,
@@ -876,14 +602,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_into_std",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_into_std.rs"],
     test_options: {
         unit_test: true,
@@ -891,14 +612,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_peek",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_peek.rs"],
     test_options: {
         unit_test: true,
@@ -906,14 +622,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_shutdown",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_shutdown.rs"],
     test_options: {
         unit_test: true,
@@ -921,14 +632,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_socket",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_socket.rs"],
     test_options: {
         unit_test: true,
@@ -936,14 +642,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_tcp_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/tcp_split.rs"],
     test_options: {
         unit_test: true,
@@ -951,14 +652,9 @@ rust_test_host {
 }
 
 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_time_rt",
+    name: "tokio_test_tests_time_rt",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/time_rt.rs"],
     test_options: {
         unit_test: true,
@@ -966,14 +662,9 @@ rust_test_host {
 }
 
 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_udp",
+    name: "tokio_test_tests_udp",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/udp.rs"],
     test_options: {
         unit_test: true,
@@ -981,14 +672,9 @@ rust_test_host {
 }
 
 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",
+    name: "tokio_test_tests_uds_cred",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     srcs: ["tests/uds_cred.rs"],
     test_options: {
         unit_test: true,
@@ -996,22 +682,11 @@ rust_test_host {
 }
 
 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_split",
+    name: "tokio_test_tests_uds_split",
     defaults: ["tokio_defaults_tokio"],
+    host_supported: true,
     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