Snap for 10453563 from a08fc69b4b84fc4dbe28a07b268b42f86cb498fa to mainline-tzdata5-release

Change-Id: I0b652b67d44f9b17bf2045e0deb7145949040b5e
diff --git a/Android.bp b/Android.bp
index 30b1224..2e835b2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,3 +57,22 @@
     product_available: true,
     vendor_available: true,
 }
+
+rust_library_rlib {
+    name: "libciborium_ll_nostd",
+    crate_name: "ciborium_ll",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.0",
+    srcs: ["src/lib.rs"],
+    edition: "2021",
+    prefer_rlib: true,
+    no_stdlibs: true,
+    rustlibs: [
+        "libciborium_io_nostd",
+        "libhalf_nostd",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}
diff --git a/cargo2android.json b/cargo2android.json
index cf7ea4a..e7673ba 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,5 @@
 {
+  "add-toplevel-block": "cargo2android_nostd.bp",
   "device": true,
   "run": true,
   "dependencies": true,
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..9912edd
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,18 @@
+rust_library_rlib {
+    name: "libciborium_ll_nostd",
+    crate_name: "ciborium_ll",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.0",
+    srcs: ["src/lib.rs"],
+    edition: "2021",
+    prefer_rlib: true,
+    no_stdlibs: true,
+    rustlibs: [
+        "libciborium_io_nostd",
+        "libhalf_nostd",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}