Snap for 11084970 from 7be86793408d040d492ab09b3bf219fe5c653850 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: Ica697968071897209794ac532c810b1a71a4e1a3

3 files changed, 24 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index fad6722..f3c5b57 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 {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index adac568..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "dependencies": true,
-  "variants": [
-    {
-    },
-    {
-      "alloc": true,
-      "dependency_suffix": "_nostd",
-      "features": "",
-      "force-rlib": true,
-      "no-host": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..8380dba
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,23 @@
+{
+  "run_cargo": false,
+  "variants": [
+    {},
+    {
+      "features": [],
+      "module_name_overrides": {
+        "libciborium": "libciborium_nostd",
+        "libciborium_io": "libciborium_io_nostd",
+        "libciborium_ll": "libciborium_ll_nostd",
+        "libserde": "libserde_nostd"
+      },
+      "package": {
+        "ciborium": {
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}