From b6fc6ffa09bada5e5f210d2b54055f9b0c65a73a Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Sat, 2 Dec 2023 18:46:32 +0000
Subject: Shift host-only to visibility restriction

Bug: 314513765
Test: cargo_embargo generate, build
Change-Id: Ia92c6d0c380809d95070c65e7707993cb530cb68
---
 Android.bp         | 17 ++++++++++++++++-
 cargo_embargo.json |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index f35a356..23af67c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,9 @@ license {
     ],
 }
 
-rust_library_host {
+rust_library {
     name: "libspki",
+    host_supported: true,
     crate_name: "spki",
     cargo_env_compat: true,
     cargo_pkg_version: "0.6.0",
@@ -40,6 +41,20 @@ rust_library_host {
     edition: "2021",
     features: ["alloc"],
     rustlibs: ["libder"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
+    visibility: [
+        "//external/rust/crates/pkcs1:__subpackages__",
+        "//external/rust/crates/pkcs8:__subpackages__",
+        "//external/rust/crates/x509-cert:__subpackages__",
+        "//packages/modules/Virtualization:__subpackages__",
+        "//system/keymint:__subpackages__",
+    ],
+
 }
 
 rust_library_rlib {
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 4b2876a..8987119 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -11,7 +11,7 @@
     {
       "package": {
         "spki": {
-          "device_supported": false
+          "add_module_block": "cargo2android_viz.bp"
         }
       }
     },
-- 
cgit v1.2.3