Snap for 11084970 from 0f91a4a9641d56a3c95777c82184c3ef4cfb5574 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: Id888adb0c14e038449964c2adc2ec649770fe65e

3 files changed, 30 insertions, 24 deletions

diff --git a/Android.bp b/Android.bp
index 971f1fc..316cf8c 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 {
@@ -74,8 +74,8 @@ rust_library_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
-        "libciborium_nostd",
         "libciborium_io_nostd",
+        "libciborium_nostd",
     ],
     apex_available: [
         "//apex_available:platform",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d1f88a1..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "dependencies": true,
-  "vendor-available": true,
-  "tests": true,
-  "variants": [
-    {
-      "features": "default,std"
-    },
-    {
-      "alloc": true,
-      "dependency_suffix": "_nostd",
-      "features": "",
-      "force-rlib": true,
-      "no-host": true,
-      "suffix": "_nostd",
-      "no-std": true,
-      "tests": false
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..65de91c
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,28 @@
+{
+  "run_cargo": false,
+  "variants": [
+    {
+      "features": [
+        "default",
+        "std"
+      ],
+      "tests": true
+    },
+    {
+      "features": [],
+      "module_name_overrides": {
+        "libciborium": "libciborium_nostd",
+        "libciborium_io": "libciborium_io_nostd",
+        "libcoset": "libcoset_nostd"
+      },
+      "package": {
+        "coset": {
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}