1 files changed, 45 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 89089ff..0e26502 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -18,13 +18,18 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "async-stream_test_defaults",
-    crate_name: "async_stream",
+rust_test {
+    name: "async-stream_test_tests_for_await",
+    host_supported: true,
+    crate_name: "for_await",
     cargo_env_compat: true,
     cargo_pkg_version: "0.3.4",
+    srcs: ["tests/for_await.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libasync_stream",
@@ -41,33 +46,57 @@ rust_defaults {
 }
 
 rust_test {
-    name: "async-stream_test_tests_for_await",
-    defaults: ["async-stream_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/for_await.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "async-stream_test_tests_spans_preserved",
-    defaults: ["async-stream_test_defaults"],
     host_supported: true,
+    crate_name: "spans_preserved",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.4",
     srcs: ["tests/spans_preserved.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libasync_stream",
+        "libfutures_core",
+        "libfutures_util",
+        "libpin_project_lite",
+        "libtokio",
+        "libtokio_test",
+    ],
+    proc_macros: [
+        "libasync_stream_impl",
+        "librustversion",
+    ],
 }
 
 rust_test {
     name: "async-stream_test_tests_try_stream",
-    defaults: ["async-stream_test_defaults"],
     host_supported: true,
+    crate_name: "try_stream",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.4",
     srcs: ["tests/try_stream.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libasync_stream",
+        "libfutures_core",
+        "libfutures_util",
+        "libpin_project_lite",
+        "libtokio",
+        "libtokio_test",
+    ],
+    proc_macros: [
+        "libasync_stream_impl",
+        "librustversion",
+    ],
 }
 
 rust_library {