Snap for 11097608 from b865040cde752340f8a5da2917cb97f2050cbff6 to 24Q1-release
Change-Id: I88f5c0fe2b29ec630f1b984e3e1a054e1837597e
diff --git a/Android.bp b/Android.bp
index 1f50f06..1dde19a 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 639f806..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "device": true,
- "run": true,
- "dependencies": true,
- "variants": [
- {
- "tests": true
- },
- {
- "alloc": true,
- "dep-suffixes": {
- "ciborium_io": "_nostd",
- "half": "_nostd"
- },
- "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..b2ac6c1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,23 @@
+{
+ "run_cargo": false,
+ "variants": [
+ {
+ "tests": true
+ },
+ {
+ "module_name_overrides": {
+ "libciborium_io": "libciborium_io_nostd",
+ "libciborium_ll": "libciborium_ll_nostd",
+ "libhalf": "libhalf_nostd"
+ },
+ "package": {
+ "ciborium-ll": {
+ "alloc": true,
+ "force_rlib": true,
+ "host_supported": false,
+ "no_std": true
+ }
+ }
+ }
+ ]
+}
