Snap for 11124398 from fcef1b827c601a716b0ae32f04b2d1d845f3ed68 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ie7eb350cf9d57950de9a36cfc39e4a75ff90c834

3 files changed, 42 insertions, 21 deletions

diff --git a/Android.bp b/Android.bp
index e6b89ff..0a3003e 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 {
@@ -41,13 +41,18 @@ rust_library {
     vendor_available: true,
 }
 
-rust_defaults {
-    name: "tokio-test_test_defaults",
-    crate_name: "tokio_test",
+rust_test {
+    name: "tokio-test_test_tests_block_on",
+    host_supported: true,
+    crate_name: "block_on",
     cargo_env_compat: true,
     cargo_pkg_version: "0.4.2",
+    srcs: ["tests/block_on.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libasync_stream",
@@ -61,31 +66,49 @@ rust_defaults {
 }
 
 rust_test {
-    name: "tokio-test_test_tests_block_on",
-    defaults: ["tokio-test_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/block_on.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "tokio-test_test_tests_io",
-    defaults: ["tokio-test_test_defaults"],
     host_supported: true,
+    crate_name: "io",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.4.2",
     srcs: ["tests/io.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libasync_stream",
+        "libbytes",
+        "libfutures_core",
+        "libfutures_util",
+        "libtokio",
+        "libtokio_stream",
+        "libtokio_test",
+    ],
 }
 
 rust_test {
     name: "tokio-test_test_tests_macros",
-    defaults: ["tokio-test_test_defaults"],
     host_supported: true,
+    crate_name: "macros",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.4.2",
     srcs: ["tests/macros.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libasync_stream",
+        "libbytes",
+        "libfutures_core",
+        "libfutures_util",
+        "libtokio",
+        "libtokio_stream",
+        "libtokio_test",
+    ],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9a0a579
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+  "tests": true
+}