aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Drysdale <drysdale@google.com>2024-02-29 09:43:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-29 09:43:38 +0000
commit101772614598511da6ad4a4bf53c07a0881dcf75 (patch)
tree5a7065bc5b4a5a32656d90ef4ae8c6549ae9c029
parent5c71d78eee97499ca8710fd0d81327806d8e5a94 (diff)
parent9d0e4dec6c054dc578ca1a4b054f3f79777f7fd0 (diff)
downloadpkcs8-main.tar.gz
Merge "Shift host-only to visibility restriction" into main am: 9d0e4dec6cHEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/pkcs8/+/2856647 Change-Id: Idd2570035e39475f035a00921ae7d5b46fb78f90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp16
-rw-r--r--cargo_embargo.json2
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"
}
}
},