diff options
| author | David Drysdale <drysdale@google.com> | 2024-02-29 09:43:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 09:43:39 +0000 |
| commit | 143a6602f8dee5a589e128c50cefa3878fa2a33a (patch) | |
| tree | 3ed079aa50fd1c045dc7e5f926990715dbb4ad03 | |
| parent | 03de58287b2b4a9b8b0d074a308e4798029999bb (diff) | |
| parent | 799243b8398d853003a7144240a9ec1fdbafcc33 (diff) | |
| download | der-143a6602f8dee5a589e128c50cefa3878fa2a33a.tar.gz | |
Merge "Shift host-only to visibility restriction" into main am: 799243b839
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/der/+/2852597
Change-Id: I947d787dcd4da75e7a97da55d0783bedaf08ba19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | cargo_embargo.json | 3 |
2 files changed, 20 insertions, 2 deletions
@@ -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" } } }, |