From 486fd8ae36820dc2eccb54366c4c889b1e9ffc1f Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Thu, 9 Nov 2023 16:20:49 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I3bb08144dfa66f055d7819243fea2e29801fc0b0
---
 Android.bp         |  2 +-
 cargo2android.json | 21 ---------------------
 cargo_embargo.json | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

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 d457e20..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "dependencies": true,
-  "variants": [
-    {},
-    {
-      "alloc": true,
-      "dep-suffixes": {
-        "ciborium_io": "_nostd",
-        "ciborium_ll": "_nostd",
-        "serde": "_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
+        }
+      }
+    }
+  ]
+}
-- 
cgit v1.2.3