Snap for 11582845 from 101772614598511da6ad4a4bf53c07a0881dcf75 to build-tools-releasebuild-tools-release

Change-Id: I282ad296447f98e221b4d5bbf04983ae9a082aec

2 files changed, 16 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index cc61a68..35e48ad 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,9 @@ license {
     ],
 }
 
-rust_library_host {
+rust_library {
     name: "libpkcs8",
+    host_supported: true,
     crate_name: "pkcs8",
     cargo_env_compat: true,
     cargo_pkg_version: "0.10.2",
@@ -43,6 +44,19 @@ rust_library_host {
         "libder",
         "libspki",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
+    visibility: [
+        "//external/rust/crates/pkcs1:__subpackages__",
+        "//external/rust/crates/sec1:__subpackages__",
+        "//packages/modules/Virtualization:__subpackages__",
+        "//system/keymint:__subpackages__",
+    ],
+
 }
 
 rust_library_rlib {
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 9d1cec5..ca82c51 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -11,7 +11,7 @@
     {
       "package": {
         "pkcs8": {
-          "device_supported": false
+          "add_module_block": "cargo2android_viz.bp"
         }
       }
     },