Snap for 11526323 from ce46b694dc554fa9485892de18e970acffcce12d to simpleperf-releasesimpleperf-release

Change-Id: I73bec37bfa83c688252ac0253550b56a9b8fa8b4

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"
         }
       }
     },