Snap for 11086585 from 3165e8915efca68bd7eec70be1467108af6aedd0 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: Ie7b1794ac012be8b38fb7c3a42b808921c634dd3

3 files changed, 47 insertions, 27 deletions

diff --git a/Android.bp b/Android.bp
index a97a427..d394bcd 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 {
@@ -66,13 +66,18 @@ rust_test {
     ],
 }
 
-rust_defaults {
-    name: "hashbrown_test_defaults",
-    crate_name: "hashbrown",
+rust_test {
+    name: "hashbrown_test_tests_hasher",
+    host_supported: true,
+    crate_name: "hasher",
     cargo_env_compat: true,
     cargo_pkg_version: "0.12.3",
+    srcs: ["tests/hasher.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2021",
     features: [
         "ahash",
@@ -92,23 +97,33 @@ rust_defaults {
 }
 
 rust_test {
-    name: "hashbrown_test_tests_hasher",
-    defaults: ["hashbrown_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/hasher.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "hashbrown_test_tests_set",
-    defaults: ["hashbrown_test_defaults"],
     host_supported: true,
+    crate_name: "set",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.12.3",
     srcs: ["tests/set.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2021",
+    features: [
+        "ahash",
+        "default",
+        "inline-more",
+        "raw",
+    ],
+    rustlibs: [
+        "libahash",
+        "libfnv",
+        "libhashbrown",
+        "liblazy_static",
+        "librand",
+        "librayon",
+        "libserde_test",
+    ],
 }
 
 rust_library {
@@ -125,9 +140,7 @@ rust_library {
         "inline-more",
         "raw",
     ],
-    rustlibs: [
-        "libahash",
-    ],
+    rustlibs: ["libahash"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4afc81f..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "device": true,
-  "features": "ahash,default,inline-more,raw",
-  "run": true,
-  "tests": true,
-  "dependency-blocklist": [
-    "doc_comment"
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..88a26ce
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,16 @@
+{
+  "features": [
+    "ahash",
+    "default",
+    "inline-more",
+    "raw"
+  ],
+  "package": {
+    "hashbrown": {
+      "dep_blocklist": [
+        "libdoc_comment"
+      ]
+    }
+  },
+  "tests": true
+}