Snap for 11096816 from 02183ab4cd50c64dad6f3ec89cbd79c84fddc6db to build-tools-release

Change-Id: Iddb6dbe66527e9f92dedf9850387d67a3c240ceb

3 files changed, 20 insertions, 17 deletions

diff --git a/Android.bp b/Android.bp
index 4af177a..e0bece5 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 1014789..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "variants": [
-    {
-    },
-    {
-      "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..e073779
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,19 @@
+{
+  "run_cargo": false,
+  "variants": [
+    {},
+    {
+      "features": [],
+      "module_name_overrides": {
+        "libbyteorder": "libbyteorder_nostd"
+      },
+      "package": {
+        "byteorder": {
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}