2 files changed, 9 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index f962468..7a2a705 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,4 +49,6 @@ rust_proc_macro {
         "libquote",
         "libsyn",
     ],
+    product_available: true,
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 386cb5e..d91171b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,31 +1,23 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "apkdmverity.test"
+      "path": "external/uwb/src"
     },
     {
-      "name": "libidsig.test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "microdroid_manager_test"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "libidsig.test"
+      "path": "packages/modules/Virtualization/libs/apkverify"
     },
     {
-      "name": "microdroid_manager_test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     }
   ]
 }