Snap for 11139387 from 8977c1a1dc4d0a46bff5a5f5d4761604b89f9893 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Id7128d105e70b04a1056739a752a3928b70656e7

3 files changed, 68 insertions, 58 deletions

diff --git a/Android.bp b/Android.bp
index e56d529..012039d 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 {
@@ -53,6 +53,48 @@ rust_library {
     min_sdk_version: "Tiramisu",
 }
 
+rust_test {
+    name: "zeroize_test_tests_zeroize",
+    host_supported: true,
+    crate_name: "zeroize",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.6.0",
+    srcs: ["tests/zeroize.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2021",
+    features: [
+        "alloc",
+        "zeroize_derive",
+    ],
+    rustlibs: ["libzeroize"],
+    proc_macros: ["libzeroize_derive"],
+}
+
+rust_test {
+    name: "zeroize_test_tests_zeroize_derive",
+    host_supported: true,
+    crate_name: "zeroize_derive",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.6.0",
+    srcs: ["tests/zeroize_derive.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2021",
+    features: [
+        "alloc",
+        "zeroize_derive",
+    ],
+    rustlibs: ["libzeroize"],
+    proc_macros: ["libzeroize_derive"],
+}
+
 rust_library_rlib {
     name: "libzeroize_nostd",
     crate_name: "zeroize",
@@ -80,41 +122,3 @@ rust_library_rlib {
     vendor_available: true,
     min_sdk_version: "Tiramisu",
 }
-
-rust_defaults {
-    name: "zeroize_test_defaults",
-    crate_name: "zeroize",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.6.0",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2021",
-    features: [
-        "alloc",
-        "zeroize_derive",
-    ],
-    rustlibs: [
-        "libzeroize",
-    ],
-    proc_macros: ["libzeroize_derive"],
-}
-
-rust_test {
-    name: "zeroize_test_tests_zeroize",
-    defaults: ["zeroize_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/zeroize.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "zeroize_test_tests_zeroize_derive",
-    defaults: ["zeroize_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/zeroize_derive.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 9ae6cab..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "min_sdk_version": "Tiramisu",
-  "vendor-available": true,
-  "features": "alloc,zeroize_derive",
-  "variants": [
-    {
-      "tests": true
-    },
-    {
-      "force-rlib": true,
-      "no-host": true,
-      "suffix": "_nostd",
-      "no-std": true,
-      "alloc": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c610529
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,25 @@
+{
+  "features": [
+    "alloc",
+    "zeroize_derive"
+  ],
+  "min_sdk_version": "Tiramisu",
+  "variants": [
+    {
+      "tests": true
+    },
+    {
+      "module_name_overrides": {
+        "libzeroize": "libzeroize_nostd"
+      },
+      "package": {
+        "zeroize": {
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}