Snap for 11139387 from a15ba5184bee2864283cd0ef19c92e824b578764 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: Id4c289ef6b67346ced17026c552f11925d1c1a38

3 files changed, 108 insertions, 34 deletions

diff --git a/Android.bp b/Android.bp
index c1c089d..060c7f2 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 {
@@ -69,13 +69,18 @@ rust_test {
     ],
 }
 
-rust_defaults {
-    name: "futures-channel_test_defaults",
-    crate_name: "futures_channel",
+rust_test {
+    name: "futures-channel_test_tests_channel",
+    host_supported: true,
+    crate_name: "channel",
     cargo_env_compat: true,
     cargo_pkg_version: "0.3.26",
+    srcs: ["tests/channel.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "alloc",
@@ -94,53 +99,119 @@ rust_defaults {
 }
 
 rust_test {
-    name: "futures-channel_test_tests_channel",
-    defaults: ["futures-channel_test_defaults"],
+    name: "futures-channel_test_tests_mpsc",
     host_supported: true,
-    srcs: ["tests/channel.rs"],
+    crate_name: "mpsc",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.26",
+    srcs: ["tests/mpsc.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "alloc",
+        "default",
+        "futures-sink",
+        "sink",
+        "std",
+    ],
+    rustlibs: [
+        "libfutures",
+        "libfutures_channel",
+        "libfutures_core",
+        "libfutures_sink",
+        "libfutures_test",
+    ],
 }
 
 rust_test {
     name: "futures-channel_test_tests_mpsc-close",
-    defaults: ["futures-channel_test_defaults"],
     host_supported: true,
+    crate_name: "mpsc_close",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.26",
     srcs: ["tests/mpsc-close.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "alloc",
+        "default",
+        "futures-sink",
+        "sink",
+        "std",
+    ],
+    rustlibs: [
+        "libfutures",
+        "libfutures_channel",
+        "libfutures_core",
+        "libfutures_sink",
+        "libfutures_test",
+    ],
 }
 
 rust_test {
     name: "futures-channel_test_tests_mpsc-size_hint",
-    defaults: ["futures-channel_test_defaults"],
     host_supported: true,
+    crate_name: "mpsc_size_hint",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.26",
     srcs: ["tests/mpsc-size_hint.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-}
-
-rust_test {
-    name: "futures-channel_test_tests_mpsc",
-    defaults: ["futures-channel_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/mpsc.rs"],
-    test_options: {
-        unit_test: true,
-    },
+    edition: "2018",
+    features: [
+        "alloc",
+        "default",
+        "futures-sink",
+        "sink",
+        "std",
+    ],
+    rustlibs: [
+        "libfutures",
+        "libfutures_channel",
+        "libfutures_core",
+        "libfutures_sink",
+        "libfutures_test",
+    ],
 }
 
 rust_test {
     name: "futures-channel_test_tests_oneshot",
-    defaults: ["futures-channel_test_defaults"],
     host_supported: true,
+    crate_name: "oneshot",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.26",
     srcs: ["tests/oneshot.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "alloc",
+        "default",
+        "futures-sink",
+        "sink",
+        "std",
+    ],
+    rustlibs: [
+        "libfutures",
+        "libfutures_channel",
+        "libfutures_core",
+        "libfutures_sink",
+        "libfutures_test",
+    ],
 }
 
 rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4458799..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.btservices",
-    "com.android.resolv",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "features": "alloc,default,std,sink",
-  "min-sdk-version": "29",
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..8d7705e
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,17 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.btservices",
+    "com.android.resolv",
+    "com.android.virt"
+  ],
+  "features": [
+    "alloc",
+    "default",
+    "std",
+    "sink"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "tests": true
+}