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
commita400beb0513ad0c8594f0e8957e140e881d97352 (patch)
treea87df38a7b5894ae3b0aef66914114e07e81190b
parent54fd1a7d222f5a05309a10fc800151d850fd135b (diff)
parent7382da31807f938162ff2e35d53ae7deb0bf0845 (diff)
downloadx509-cert-a400beb0513ad0c8594f0e8957e140e881d97352.tar.gz
Merge "Shift host-only to visibility restriction" into main am: 7382da3180HEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/x509-cert/+/2856625 Change-Id: I1ba56ef5030d03559c2af7198a001c8357b4cb4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp14
-rw-r--r--cargo_embargo.json2
2 files changed, 14 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 01da6f9..a250423 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,9 @@ license {
],
}
-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 @@ 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 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"
}
}
},