From a8ceee78cb1d8c797c07b52164a27d4d7136dc97 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 23 Oct 2023 12:49:12 +0100
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Run cargo_embargo, compared Android.bp.
Change-Id: I5f5c269bf84392bf9749fdab02f21b4dd316a03e
---
 Android.bp         | 61 ++++++++++++++++++++++++++++++++++++++++--------------
 cargo2android.json | 11 ----------
 cargo_embargo.json | 15 ++++++++++++++
 3 files changed, 60 insertions(+), 27 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

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",
@@ -40,34 +45,58 @@ 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 0c66159..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "tests": true,
-  "dependency-blocklist": [
-    "trybuild"
-  ],
-  "test-blocklist": [
-    "tests/stream.rs"
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..9c1d61a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+  "tests": true,
+  "package": {
+    "async-stream": {
+      "dep_blocklist": [
+        "libtrybuild"
+      ]
+    }
+  },
+  "module_blocklist": [
+    "async-stream_test_src_lib",
+    "async-stream_test_tests_stream"
+  ],
+  "run_cargo": false
+}
-- 
cgit v1.2.3