From 09fa908e3c5e8bb1462b7fcce08c3543f5d51d5d Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 10 Nov 2023 17:26:30 +0000
Subject: Migrate to cargo_embargo.

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

diff --git a/Android.bp b/Android.bp
index 277e33f..bcd2bb2 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 ca16a7e..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "vendor-available": true,
-  "variants": [
-    {
-    },
-    {
-      "device": true,
-      "alloc": true,
-      "no-host": true,
-      "force-rlib": true,
-      "suffix": "_nostd",
-      "no-std": true,
-      "features" : "alloc"
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..3bbad79
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,22 @@
+{
+  "run_cargo": false,
+  "variants": [
+    {},
+    {
+      "features": [
+        "alloc"
+      ],
+      "module_name_overrides": {
+        "libhex": "libhex_nostd"
+      },
+      "package": {
+        "hex": {
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}
-- 
cgit v1.2.3