commit d5cc41a9ed2cd1204a03fc9a4c7eb507f0238cb9
author Andrew Walbran <qwandor@google.com> Thu Nov 23 00:57:16 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 23 00:57:16 2023 +0000
tree 7fb89dfed86a7922f7337e2a1d7c0ab714f32c13
parent 2f331635032a1083d76c82a997c5c5a02cbf2b61
parent e0ad8793ea3ac23a8f0cfd276f4a0e50f096eb91

Migrate to cargo_embargo. am: d19ea6527f am: 1768b48aad am: e0ad8793ea

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-channel/+/2833071

Change-Id: I9444c5b81f9df301c3986a93d7599a26bd853f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

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_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_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 {

cargo2android.json

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
-}

cargo_embargo.json

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
+}