aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Drysdale <drysdale@google.com>2024-02-29 09:43:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-29 09:43:37 +0000
commitecc22a4bf955f6f4f442120a18616e9e13165990 (patch)
treefe79341555bacc1bc0db78c3e2af93d77b7fc8c2
parent4768fc68490ed34d6ade3fbb0ac257e57cc7eebf (diff)
parentce46b694dc554fa9485892de18e970acffcce12d (diff)
downloadflagset-ecc22a4bf955f6f4f442120a18616e9e13165990.tar.gz
Merge "Shift host-only to visibility restriction" into main am: ce46b694dc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/flagset/+/2852552 Change-Id: I4d3b2750fb4fd4b30a6ae5c59765c162f9f410f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp15
-rw-r--r--cargo_embargo.json2
2 files changed, 15 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 6d59537..53505d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,13 +18,26 @@ license {
],
}
-rust_library_host {
+rust_library {
name: "libflagset",
+ host_supported: true,
crate_name: "flagset",
cargo_env_compat: true,
cargo_pkg_version: "0.4.3",
srcs: ["src/lib.rs"],
edition: "2018",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
+ product_available: true,
+ vendor_available: true,
+ visibility: [
+ "//external/rust/crates/der:__subpackages__",
+ "//external/rust/crates/x509-cert:__subpackages__",
+ "//system/keymint:__subpackages__",
+ ],
+
}
rust_library_rlib {
diff --git a/cargo_embargo.json b/cargo_embargo.json
index 064a7af..69a8042 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -8,7 +8,7 @@
{
"package": {
"flagset": {
- "device_supported": false
+ "add_module_block": "cargo2android_viz.bp"
}
}
},