Snap for 10909147 from 8c52411fa9d8ed7079ff515af6898c37ffd6f9e8 to 24Q1-release

Change-Id: I48dd1e924394c7ce2ba1b5f923dfc56794a45994

3 files changed, 47 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index b3c48f6..fe377df 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,36 @@ rust_library_host {
         "libflagset",
         "libspki",
     ],
+}
+
+rust_library_rlib {
+    name: "libx509_cert_nostd",
+    crate_name: "x509_cert",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.1",
+    srcs: ["src/lib.rs"],
+    edition: "2021",
+    features: ["alloc"],
+    rustlibs: [
+        "libconst_oid_nostd",
+        "libder_nostd",
+        "libflagset_nostd",
+        "libspki_nostd",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    prefer_rlib: true,
+    no_stdlibs: true,
+    stdlibs: [
+        "libcompiler_builtins.rust_sysroot",
+        "libcore.rust_sysroot",
+    ],
     product_available: true,
     vendor_available: true,
+    visibility: [
+         "//system/keymint:__subpackages__",
+    ]
+    ,
 }
diff --git a/cargo2android.json b/cargo2android.json
index e26e552..e6baa85 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,5 +5,18 @@
   ],
   "run": true,
   "vendor-available": true,
-  "features": "alloc"
+  "features": "alloc",
+  "variants": [
+    {
+    },
+    {
+      "device": true,
+      "no-host": true,
+      "add-module-block": "cargo2android_viz.bp",
+      "dependency_suffix": "_nostd",
+      "force-rlib": true,
+      "suffix": "_nostd",
+      "no-std": true
+    }
+  ]
 }
diff --git a/cargo2android_viz.bp b/cargo2android_viz.bp
new file mode 100644
index 0000000..6912520
--- /dev/null
+++ b/cargo2android_viz.bp
@@ -0,0 +1,3 @@
+visibility: [
+     "//system/keymint:__subpackages__",
+]