3 files changed, 24 insertions, 120 deletions
diff --git a/Android.bp b/Android.bp
index 6a110ae..2d69422 100644
--- a/Android.bp
+++ b/Android.bp
@@ -102,7 +102,7 @@ rust_library {
     features: ["default"],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
+        "com.android.btservices",
         "com.android.compos",
         "com.android.virt",
     ],
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 86f3a37..0265d92 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,7 +5,7 @@
       "path": "external/rust/crates/base64"
     },
     {
-      "path": "external/rust/crates/clap"
+      "path": "external/rust/crates/clap/2.33.3"
     },
     {
       "path": "external/rust/crates/gdbstub_arch"
@@ -24,166 +24,70 @@
     },
     {
       "path": "external/rust/crates/unicode-xid"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "VtsAidlDiceDemoteTargetTest"
-    },
-    {
-      "name": "VtsAidlDiceTargetTest"
     },
     {
-      "name": "ZipFuseTest"
+      "path": "external/rust/crates/virtio-drivers"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "bitflags_test_src_lib"
-    },
-    {
-      "name": "bitflags_test_tests_basic"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "diced_open_dice_cbor_test"
+      "path": "packages/modules/Virtualization/encryptedstore"
     },
     {
-      "name": "diced_sample_inputs_test"
+      "path": "packages/modules/Virtualization/libs/apkverify"
     },
     {
-      "name": "diced_test"
+      "path": "packages/modules/Virtualization/libs/capabilities"
     },
     {
-      "name": "diced_utils_test"
+      "path": "packages/modules/Virtualization/libs/devicemapper"
     },
     {
-      "name": "diced_vendor_test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "keystore2_client_tests"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "keystore2_crypto_test_rust"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "keystore2_legacy_blobs_test"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
+      "path": "system/security/diced"
     },
     {
-      "name": "keystore2_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "system/security/keystore2/legacykeystore"
     },
     {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "libidsig.test"
-    },
-    {
-      "name": "libtombstoned_client_rust_test"
-    },
+      "path": "system/security/keystore2/src/crypto"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "microdroid_manager_test"
+      "name": "bitflags_test_src_lib"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "bitflags_test_tests_basic"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "VtsAidlDiceDemoteTargetTest"
-    },
-    {
-      "name": "VtsAidlDiceTargetTest"
-    },
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
       "name": "bitflags_test_src_lib"
     },
     {
       "name": "bitflags_test_tests_basic"
-    },
-    {
-      "name": "diced_open_dice_cbor_test"
-    },
-    {
-      "name": "diced_sample_inputs_test"
-    },
-    {
-      "name": "diced_test"
-    },
-    {
-      "name": "diced_utils_test"
-    },
-    {
-      "name": "diced_vendor_test"
-    },
-    {
-      "name": "keystore2_client_tests"
-    },
-    {
-      "name": "keystore2_crypto_test_rust"
-    },
-    {
-      "name": "keystore2_legacy_blobs_test"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_test_utils_test"
-    },
-    {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "libidsig.test"
-    },
-    {
-      "name": "libtombstoned_client_rust_test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index be5b70b..73294f5 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,7 @@
 {
   "apex-available": [
     "//apex_available:platform",
-    "com.android.bluetooth",
+    "com.android.btservices",
     "com.android.compos",
     "com.android.virt"
   ],