From cf908a4d4456a116cc7a6a810daca2a656f1f9cc Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Tue, 14 Nov 2023 14:37:13 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I1d5b9ac6586583358bb672751b5954bbbd48e0c6
---
 Android.bp         | 41 ++++++++++++++++++++++++++---------------
 cargo2android.json |  9 ---------
 cargo_embargo.json |  7 +++++++
 3 files changed, 33 insertions(+), 24 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 047b21e..c11e446 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 {
@@ -39,13 +39,18 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "crossbeam-queue_test_defaults",
-    crate_name: "crossbeam_queue",
+rust_test {
+    name: "crossbeam-queue_test_tests_array_queue",
+    host_supported: true,
+    crate_name: "array_queue",
     cargo_env_compat: true,
     cargo_pkg_version: "0.3.8",
+    srcs: ["tests/array_queue.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "alloc",
@@ -60,24 +65,30 @@ rust_defaults {
     ],
 }
 
-rust_test {
-    name: "crossbeam-queue_test_tests_array_queue",
-    defaults: ["crossbeam-queue_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/array_queue.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
     name: "crossbeam-queue_test_tests_seg_queue",
-    defaults: ["crossbeam-queue_test_defaults"],
     host_supported: true,
+    crate_name: "seg_queue",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.8",
     srcs: ["tests/seg_queue.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "alloc",
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_queue",
+        "libcrossbeam_utils",
+        "librand",
+    ],
 }
 
 rust_library {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6e516e0..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "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..7f14879
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "tests": true
+}
-- 
cgit v1.2.3