Merge "Shift host-only to visibility restriction" into main am: 4b6a597453HEADmastermain

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pkcs1/+/2856646

Change-Id: Ib2723ddadbcc66ad0226cd736d6e4c3aee8ad28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 14 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 51289d5..b944169 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,9 @@ license {
     ],
 }
 
-rust_library_host {
+rust_library {
     name: "libpkcs1",
+    host_supported: true,
     crate_name: "pkcs1",
     cargo_env_compat: true,
     cargo_pkg_version: "0.7.5",
@@ -46,6 +47,17 @@ rust_library_host {
         "libder",
         "libspki",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
+    visibility: [
+        "//packages/modules/Virtualization:__subpackages__",
+        "//system/keymint:__subpackages__",
+    ],
+
 }
 
 rust_library_rlib {
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 1a8911c..2b1d241 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -11,7 +11,7 @@
     {
       "package": {
         "pkcs1": {
-          "device_supported": false
+          "add_module_block": "cargo2android_viz.bp"
         }
       }
     },