Snap for 10453563 from b2f00b21838fac4b86cc24a3b3fd99060ad7e004 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release

Change-Id: I7e74b1be4430e561823718c5ca76d9bd4321b608

3 files changed, 22 insertions, 21 deletions

diff --git a/Android.bp b/Android.bp
index 2034097..a785207 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,10 +51,10 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.compos",
-        "com.android.virt",
+        "//apex_available:anyapex",
     ],
+    product_available: true,
+    vendor_available: true,
     min_sdk_version: "29",
 }
 
diff --git a/TEST_MAPPING b/TEST_MAPPING
index af52a19..26eebef 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,6 +11,9 @@
       "path": "external/rust/crates/crossbeam-epoch"
     },
     {
+      "path": "external/rust/crates/hashbrown"
+    },
+    {
       "path": "external/rust/crates/tinytemplate"
     },
     {
@@ -21,27 +24,30 @@
     },
     {
       "path": "external/rust/crates/vulkano"
-    }
-  ],
-  "presubmit": [
+    },
+    {
+      "path": "packages/modules/Virtualization/apkdmverity"
+    },
+    {
+      "path": "packages/modules/Virtualization/libs/capabilities"
+    },
     {
-      "name": "ZipFuseTest"
+      "path": "packages/modules/Virtualization/libs/devicemapper"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
+      "path": "packages/modules/Virtualization/zipfuse"
+    }
+  ],
+  "presubmit": [
+    {
       "name": "scopeguard_test_src_lib"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
       "name": "scopeguard_test_src_lib"
     }
   ]
diff --git a/cargo2android.json b/cargo2android.json
index 4384672..0bf05f4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,13 +1,8 @@
 {
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.compos",
-    "com.android.virt"
-  ],
   "dependencies": true,
   "device": true,
   "min-sdk-version": "29",
   "run": true,
-  "tests": true
+  "tests": true,
+  "vendor-available": true
 }