Snap for 11098506 from 09fa908e3c5e8bb1462b7fcce08c3543f5d51d5d to sdk-release

Change-Id: Ide20d19ec45054a733edf9f63798f80b27f3c1dd

3 files changed, 23 insertions, 20 deletions

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 d3874c5..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "vendor-available": true,
-  "variants": [
-    {
-    },
-    {
-      "device": true,
-      "alloc": true,
-      "no-host": true,
-      "dependency_suffix": "_nostd",
-      "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
+        }
+      }
+    }
+  ]
+}