Snap for 11096816 from 5f2cd90e6481497260b9d85cc0df5ea4377d70f1 to build-tools-release

Change-Id: Icc37cadfa5744a57f326e490faa32165d4615e22

4 files changed, 39 insertions, 19 deletions

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 6992142..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "dependencies": true,
-  "variants": [
-    {
-      "tests": true
-    },
-    {
-      "alloc": true,
-      "dependency_suffix": "_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
+        }
+      }
+    }
+  ]
+}
diff --git a/rules.mk b/rules.mk
new file mode 100644
index 0000000..766aeee
--- /dev/null
+++ b/rules.mk
@@ -0,0 +1,15 @@
+# This file is generated by cargo2rulesmk.py --run --features .
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := ciborium_ll
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2021
+MODULE_LIBRARY_DEPS := \
+	external/rust/crates/ciborium-io \
+	external/rust/crates/half \
+
+include make/library.mk