1 files changed, 43 insertions, 39 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,
-    },
-}