2 files changed, 9 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 80bcd09..8e46cb3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,6 +30,12 @@ rust_library {
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_test {
@@ -49,8 +55,4 @@ rust_test {
         "default",
         "std",
     ],
-    flags: [
-        "-C debug-assertions=on",
-        "-C opt-level=1",
-    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f9cd6e4..d411a82 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,6 +3,9 @@
   "imports": [
     {
       "path": "external/rust/crates/gdbstub_arch"
+    },
+    {
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     }
   ],
   "presubmit": [