Snap for 10453563 from 392439e66255af7a2853bbea4fab3987d01bb19d to mainline-extservices-releaseaml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030android14-mainline-extservices-release

Change-Id: I80c35a561ce0769e42a12af3e1d1a7f9ee382466

4 files changed, 60 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 3cdbd00..46dfd24 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: ["external_rust_crates_ciborium_license"],
 }
@@ -37,4 +35,30 @@ rust_library {
         "libciborium_ll",
         "libserde",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
+}
+
+rust_library_rlib {
+    name: "libciborium_nostd",
+    crate_name: "ciborium",
+    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",
+        "libciborium_ll_nostd",
+        "libserde_nostd",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2f7de78..2903e5f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,13 +1,14 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "libcert_request_validator_tests"
-    }
-  ],
-  "presubmit-rust": [
+      "path": "external/rust/crates/coset"
+    },
+    {
+      "path": "system/keymint/derive"
+    },
     {
-      "name": "libcert_request_validator_tests"
+      "path": "system/keymint/hal"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..07c27da
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,7 @@
+{
+  "add-toplevel-block": "cargo2android_nostd.bp",
+  "device": true,
+  "run": true,
+  "dependencies": true,
+  "vendor-available": true
+}
diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp
new file mode 100644
index 0000000..1b35e95
--- /dev/null
+++ b/cargo2android_nostd.bp
@@ -0,0 +1,19 @@
+rust_library_rlib {
+    name: "libciborium_nostd",
+    crate_name: "ciborium",
+    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",
+        "libciborium_ll_nostd",
+        "libserde_nostd",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+}