Snap for 10453563 from 322e5b51150e1f1c6fe3e30cf7d33c6563a020f3 to mainline-media-releaseaml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010android14-mainline-media-release

Change-Id: I174a2d9b9fff036d35a44fc9648ce134e10b2936

3 files changed, 48 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
index fb8d206..096603c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,10 +47,9 @@ rust_library {
     edition: "2018",
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.resolv",
-        "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 e517942..6b51743 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -5,6 +5,18 @@
       "path": "external/rust/crates/anyhow"
     },
     {
+      "path": "external/rust/crates/async-stream"
+    },
+    {
+      "path": "external/rust/crates/futures-channel"
+    },
+    {
+      "path": "external/rust/crates/futures-executor"
+    },
+    {
+      "path": "external/rust/crates/futures-test"
+    },
+    {
       "path": "external/rust/crates/futures-util"
     },
     {
@@ -12,46 +24,64 @@
     },
     {
       "path": "external/rust/crates/tokio-test"
-    }
-  ],
-  "presubmit": [
+    },
     {
-      "name": "ZipFuseTest"
+      "path": "packages/modules/DnsResolver"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "doh_unit_test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "pin-utils_test_tests_projection"
+      "path": "packages/modules/Virtualization/encryptedstore"
     },
     {
-      "name": "pin-utils_test_tests_stack_pin"
+      "path": "packages/modules/Virtualization/libs/capabilities"
     },
     {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
+      "path": "packages/modules/Virtualization/libs/devicemapper"
+    },
     {
-      "name": "ZipFuseTest"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "doh_unit_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
+      "path": "packages/modules/Virtualization/zipfuse"
+    },
+    {
+      "path": "system/security/diced"
+    },
+    {
+      "path": "system/security/keystore2"
+    },
+    {
+      "path": "system/security/keystore2/legacykeystore"
+    },
+    {
+      "path": "system/security/keystore2/src/crypto"
+    }
+  ],
+  "presubmit": [
+    {
       "name": "pin-utils_test_tests_projection"
     },
     {
       "name": "pin-utils_test_tests_stack_pin"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "pin-utils_test_tests_projection"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "pin-utils_test_tests_stack_pin"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index b9b5680..e9ed115 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,10 +1,4 @@
 {
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.resolv",
-    "com.android.virt"
-  ],
   "dependencies": true,
   "device": true,
   "min-sdk-version": "29",