Snap for 11097608 from f56f35bc218616237b290b2de82ff3a341959e58 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Ife984bd6151235bd76777f58f47853a01d9eea27

2 files changed, 28 insertions, 19 deletions

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",
@@ -61,23 +66,29 @@ 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/cargo_embargo.json
index 6e516e0..7f14879 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,9 +1,7 @@
 {
-  "apex-available": [
+  "apex_available": [
     "//apex_available:platform",
     "com.android.virt"
   ],
-  "device": true,
-  "run": true,
   "tests": true
-}
\ No newline at end of file
+}