aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Drysdale <drysdale@google.com>2024-02-29 09:12:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-02-29 09:12:12 +0000
commit799243b8398d853003a7144240a9ec1fdbafcc33 (patch)
tree3ed079aa50fd1c045dc7e5f926990715dbb4ad03
parentaf191c320d0625f8fb41f90338fbb2e52b1a80ba (diff)
parentb67f7c66d9cf0055c79b32cc69d69c64347e0359 (diff)
downloadder-799243b8398d853003a7144240a9ec1fdbafcc33.tar.gz
Merge "Shift host-only to visibility restriction" into main
-rw-r--r--Android.bp19
-rw-r--r--cargo_embargo.json3
2 files changed, 20 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 31a63ba..f10d1a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,9 @@ license {
],
}
-rust_library_host {
+rust_library {
name: "libder",
+ host_supported: true,
crate_name: "der",
cargo_env_compat: true,
cargo_pkg_version: "0.7.8",
@@ -51,6 +52,22 @@ rust_library_host {
"libzeroize",
],
proc_macros: ["libder_derive"],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
+ product_available: true,
+ vendor_available: true,
+ visibility: [
+ "//external/rust/crates/sec1:__subpackages__",
+ "//external/rust/crates/spki:__subpackages__",
+ "//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 61bd3ea..ca989f0 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -10,12 +10,13 @@
"oid",
"zeroize"
],
+ "vendor_available": true,
"run_cargo": false,
"variants": [
{
"package": {
"der": {
- "device_supported": false
+ "add_module_block": "cargo2android_viz.bp"
}
}
},