Snap for 10453563 from 44f0b010f2e47026530b79e3d6ddd829e6087e4a to mainline-appsearch-releaseaml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000android14-mainline-appsearch-release

Change-Id: I3007df38f50ad958a7bc7ca5f4a98b2f161cbe3c

3 files changed, 30 insertions, 33 deletions

diff --git a/Android.bp b/Android.bp
index 0e15608..d0960e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,6 +58,8 @@ rust_library {
         "//apex_available:platform",
         "com.android.virt",
     ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_test {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3f99cb1..7c1613b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -23,6 +23,12 @@
       "path": "external/rust/crates/crossbeam-utils"
     },
     {
+      "path": "external/rust/crates/flate2"
+    },
+    {
+      "path": "external/rust/crates/hashbrown"
+    },
+    {
       "path": "external/rust/crates/mio"
     },
     {
@@ -36,64 +42,52 @@
     },
     {
       "path": "external/rust/crates/tokio"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/rust/crates/zerocopy"
     },
     {
-      "name": "keystore2_test"
+      "path": "external/uwb/src"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "rand_chacha_test_src_lib"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
+      "path": "packages/modules/Virtualization/libs/devicemapper"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "microdroid_manager_test"
-    },
+      "path": "system/security/keystore2/legacykeystore"
+    }
+  ],
+  "presubmit": [
     {
       "name": "rand_chacha_test_src_lib"
-    },
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "virtualizationservice_device_test"
+      "name": "rand_chacha_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index ac56e26..60b7aa4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,5 +6,6 @@
   "dependencies": true,
   "device": true,
   "run": true,
-  "tests": true
-}
\ No newline at end of file
+  "tests": true,
+  "vendor-available": true
+}