Merge 302b0b36 on remote branch

Change-Id: Icf52ef4001026518d1d0760e683f54e1f760d304

Android.bp

-// 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 {

cargo2android.json

-{
-  "device": true,
-  "run": true,
-  "dependencies": true,
-  "variants": [
-    {
-      "features": "alloc,std"
-    },
-    {
-      "alloc": true,
-      "features": "alloc",
-      "force-rlib": true,
-      "no-host": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}

cargo2rulesmk.json

+{
+  "features": "alloc",
+  "patch": "patches/rules.mk.diff"
+}

cargo_embargo.json

+{
+  "run_cargo": false,
+  "variants": [
+    {
+      "features": [
+        "alloc",
+        "std"
+      ]
+    },
+    {
+      "features": [
+        "alloc"
+      ],
+      "module_name_overrides": {
+        "libciborium_io": "libciborium_io_nostd"
+      },
+      "package": {
+        "ciborium-io": {
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}

patches/rules.mk.diff

+13a14,16
+> MODULE_LIBRARY_DEPS := \
+> 	trusty/user/base/lib/liballoc-rust \
+> 

rules.mk

+# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json.
+# Do not modify this file as changes will be overridden on upgrade.
+
+LOCAL_DIR := $(GET_LOCAL_DIR)
+MODULE := $(LOCAL_DIR)
+MODULE_CRATE_NAME := ciborium_io
+MODULE_SRCS := \
+	$(LOCAL_DIR)/src/lib.rs \
+
+MODULE_RUST_EDITION := 2021
+MODULE_RUSTFLAGS += \
+	--cfg 'feature="alloc"' \
+
+MODULE_LIBRARY_DEPS := \
+	trusty/user/base/lib/liballoc-rust \
+
+include make/library.mk