Snap for 11111096 from bd2e8aaba8a4569b7c707203270540cf1b3a0a53 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: I21a4b4a8a5af8d9a3176876a322ce626db11d579

3 files changed, 135 insertions, 28 deletions

diff --git a/Android.bp b/Android.bp
index 5614204..059bef4 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 {
@@ -62,13 +62,18 @@ rust_library {
     vendor_available: true,
 }
 
-rust_defaults {
-    name: "serde_cbor_test_defaults",
-    crate_name: "serde_cbor",
+rust_test {
+    name: "serde_cbor_test_tests_bennofs",
+    host_supported: true,
+    crate_name: "bennofs",
     cargo_env_compat: true,
     cargo_pkg_version: "0.11.2",
+    srcs: ["tests/bennofs.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -84,81 +89,183 @@ rust_defaults {
 }
 
 rust_test {
-    name: "serde_cbor_test_tests_bennofs",
-    defaults: ["serde_cbor_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/bennofs.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "serde_cbor_test_tests_canonical",
-    defaults: ["serde_cbor_test_defaults"],
     host_supported: true,
+    crate_name: "canonical",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.2",
     srcs: ["tests/canonical.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+        "tags",
+    ],
+    rustlibs: [
+        "libhalf",
+        "libserde",
+        "libserde_cbor",
+    ],
+    proc_macros: ["libserde_derive"],
 }
 
 rust_test {
     name: "serde_cbor_test_tests_de",
-    defaults: ["serde_cbor_test_defaults"],
     host_supported: true,
+    crate_name: "de",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.2",
     srcs: ["tests/de.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+        "tags",
+    ],
+    rustlibs: [
+        "libhalf",
+        "libserde",
+        "libserde_cbor",
+    ],
+    proc_macros: ["libserde_derive"],
 }
 
 rust_test {
     name: "serde_cbor_test_tests_enum",
-    defaults: ["serde_cbor_test_defaults"],
     host_supported: true,
+    crate_name: "enum",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.2",
     srcs: ["tests/enum.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+        "tags",
+    ],
+    rustlibs: [
+        "libhalf",
+        "libserde",
+        "libserde_cbor",
+    ],
+    proc_macros: ["libserde_derive"],
 }
 
 rust_test {
     name: "serde_cbor_test_tests_ser",
-    defaults: ["serde_cbor_test_defaults"],
     host_supported: true,
+    crate_name: "ser",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.2",
     srcs: ["tests/ser.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+        "tags",
+    ],
+    rustlibs: [
+        "libhalf",
+        "libserde",
+        "libserde_cbor",
+    ],
+    proc_macros: ["libserde_derive"],
 }
 
 rust_test {
     name: "serde_cbor_test_tests_std_types",
-    defaults: ["serde_cbor_test_defaults"],
     host_supported: true,
+    crate_name: "std_types",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.2",
     srcs: ["tests/std_types.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+        "tags",
+    ],
+    rustlibs: [
+        "libhalf",
+        "libserde",
+        "libserde_cbor",
+    ],
+    proc_macros: ["libserde_derive"],
 }
 
 rust_test {
     name: "serde_cbor_test_tests_tags",
-    defaults: ["serde_cbor_test_defaults"],
     host_supported: true,
+    crate_name: "tags",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.2",
     srcs: ["tests/tags.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+        "tags",
+    ],
+    rustlibs: [
+        "libhalf",
+        "libserde",
+        "libserde_cbor",
+    ],
+    proc_macros: ["libserde_derive"],
 }
 
 rust_test {
     name: "serde_cbor_test_tests_value",
-    defaults: ["serde_cbor_test_defaults"],
     host_supported: true,
+    crate_name: "value",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.11.2",
     srcs: ["tests/value.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+        "tags",
+    ],
+    rustlibs: [
+        "libhalf",
+        "libserde",
+        "libserde_cbor",
+    ],
+    proc_macros: ["libserde_derive"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 604d595..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "device": true,
-  "features": "default,tags",
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..abdd3d0
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+  "features": [
+    "default",
+    "tags"
+  ],
+  "tests": true
+}