aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Drysdale <drysdale@google.com>2024-02-29 09:43:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-29 09:43:39 +0000
commit46149186c07cb5f484bcef3d37bf5a2ee91c67fb (patch)
treea2ef9a7a25ea28e50fb8cc953c9b0e76a56b8c90
parent68c5d5f31f0fa1567792bfa467a375ad5d3220a1 (diff)
parenta6b5f20bcbed08dff64fa9d845fb856a59525a9e (diff)
downloadspki-46149186c07cb5f484bcef3d37bf5a2ee91c67fb.tar.gz
Merge "Shift host-only to visibility restriction" into main am: a6b5f20bcbHEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spki/+/2856645 Change-Id: I0d2901ed282822737be816856e1eb92509aa5dda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp17
-rw-r--r--cargo_embargo.json2
2 files changed, 17 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 7d7b447..5c3b62b 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.7.3",
@@ -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"
}
}
},