diff --git a/Android.bp b/Android.bp
index 01da6f9..a250423 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,9 @@
     ],
 }
 
-rust_library_host {
+rust_library {
     name: "libx509_cert",
+    host_supported: true,
     crate_name: "x509_cert",
     cargo_env_compat: true,
     cargo_pkg_version: "0.2.4",
@@ -43,6 +44,17 @@
         "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 e6f2c7a..a36fc1f 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -9,7 +9,7 @@
     {
       "package": {
         "x509-cert": {
-          "device_supported": false
+          "add_module_block": "cargo2android_viz.bp"
         }
       }
     },