No need for patch, just use variants.

Test: Ran cargo2android, compared output
Change-Id: I0a7fb5a824ccc866afc25ca0f0d695d494fa2602

1 files changed, 42 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 24cde59..652d6e2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,9 +18,10 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "tokio_defaults",
+rust_library {
+    name: "libtokio",
     host_supported: true,
+    crate_name: "tokio",
     cargo_env_compat: true,
     cargo_pkg_version: "1.25.0",
     srcs: ["src/lib.rs"],
@@ -55,9 +56,7 @@ rust_defaults {
     proc_macros: ["libtokio_macros"],
     apex_available: [
         "//apex_available:platform",
-        "com.android.btservices",
-        "com.android.resolv",
-        "com.android.uwb",
+        "//apex_available:anyapex",
     ],
     product_available: true,
     vendor_available: true,
@@ -65,18 +64,49 @@ rust_defaults {
 }
 
 rust_library {
-    name: "libtokio",
-    crate_name: "tokio",
-    defaults: ["tokio_defaults"],
-}
-
-rust_library {
     name: "libtokio_for_test",
+    host_supported: true,
     crate_name: "tokio",
-    defaults: ["tokio_defaults"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.25.0",
+    srcs: ["src/lib.rs"],
+    edition: "2018",
     features: [
+        "bytes",
+        "fs",
+        "io-util",
+        "libc",
+        "macros",
+        "memchr",
+        "mio",
+        "net",
+        "num_cpus",
+        "rt",
+        "rt-multi-thread",
+        "socket2",
+        "sync",
         "test-util",
+        "time",
+        "tokio-macros",
+        "windows-sys",
     ],
+    rustlibs: [
+        "libbytes",
+        "liblibc",
+        "libmemchr",
+        "libmio",
+        "libnum_cpus",
+        "libpin_project_lite",
+        "libsocket2",
+    ],
+    proc_macros: ["libtokio_macros"],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
+    min_sdk_version: "29",
 }
 
 rust_defaults {