Migrate to cargo_embargo. am: 2797491abe

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-utils/+/2828316

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

2 files changed, 93 insertions, 26 deletions

diff --git a/Android.bp b/Android.bp
index 8b5ecf9..edd8df6 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 {
@@ -63,13 +63,18 @@ rust_test {
     proc_macros: ["librustversion"],
 }
 
-rust_defaults {
-    name: "crossbeam-utils_test_defaults",
-    crate_name: "crossbeam_utils",
+rust_test {
+    name: "crossbeam-utils_test_tests_atomic_cell",
+    host_supported: true,
+    crate_name: "atomic_cell",
     cargo_env_compat: true,
     cargo_pkg_version: "0.8.15",
+    srcs: ["tests/atomic_cell.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -84,63 +89,128 @@ rust_defaults {
 }
 
 rust_test {
-    name: "crossbeam-utils_test_tests_atomic_cell",
-    defaults: ["crossbeam-utils_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/atomic_cell.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "crossbeam-utils_test_tests_cache_padded",
-    defaults: ["crossbeam-utils_test_defaults"],
     host_supported: true,
+    crate_name: "cache_padded",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.15",
     srcs: ["tests/cache_padded.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_utils",
+        "librand",
+    ],
+    proc_macros: ["librustversion"],
 }
 
 rust_test {
     name: "crossbeam-utils_test_tests_parker",
-    defaults: ["crossbeam-utils_test_defaults"],
     host_supported: true,
+    crate_name: "parker",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.15",
     srcs: ["tests/parker.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_utils",
+        "librand",
+    ],
+    proc_macros: ["librustversion"],
 }
 
 rust_test {
     name: "crossbeam-utils_test_tests_sharded_lock",
-    defaults: ["crossbeam-utils_test_defaults"],
     host_supported: true,
+    crate_name: "sharded_lock",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.15",
     srcs: ["tests/sharded_lock.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_utils",
+        "librand",
+    ],
+    proc_macros: ["librustversion"],
 }
 
 rust_test {
     name: "crossbeam-utils_test_tests_thread",
-    defaults: ["crossbeam-utils_test_defaults"],
     host_supported: true,
+    crate_name: "thread",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.15",
     srcs: ["tests/thread.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_utils",
+        "librand",
+    ],
+    proc_macros: ["librustversion"],
 }
 
 rust_test {
     name: "crossbeam-utils_test_tests_wait_group",
-    defaults: ["crossbeam-utils_test_defaults"],
     host_supported: true,
+    crate_name: "wait_group",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.8.15",
     srcs: ["tests/wait_group.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libcfg_if",
+        "libcrossbeam_utils",
+        "librand",
+    ],
+    proc_macros: ["librustversion"],
 }
 
 rust_library {
@@ -155,9 +225,7 @@ rust_library {
         "default",
         "std",
     ],
-    rustlibs: [
-        "libcfg_if",
-    ],
+    rustlibs: ["libcfg_if"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
diff --git a/cargo2android.json b/cargo_embargo.json
index 6e516e0..fcc96ec 100644
--- a/cargo2android.json
+++ b/cargo_embargo.json
@@ -1,9 +1,8 @@
 {
-  "apex-available": [
+  "apex_available": [
     "//apex_available:platform",
     "com.android.virt"
   ],
-  "device": true,
-  "run": true,
+  "run_cargo": false,
   "tests": true
-}
\ No newline at end of file
+}