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

Change-Id: Ia08387ce020f439df3cc4ab286575850adbc93b0

3 files changed, 45 insertions, 118 deletions

diff --git a/Android.bp b/Android.bp
index 752ec2e..8711098 100644
--- a/Android.bp
+++ b/Android.bp
@@ -80,12 +80,9 @@ rust_library {
     edition: "2018",
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.compos",
-        "com.android.resolv",
-        "com.android.uwb",
-        "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 da760e2..1f7fb90 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,6 +8,9 @@
       "path": "external/rust/crates/ash"
     },
     {
+      "path": "external/rust/crates/async-stream"
+    },
+    {
       "path": "external/rust/crates/base64"
     },
     {
@@ -32,6 +35,9 @@
       "path": "external/rust/crates/env_logger"
     },
     {
+      "path": "external/rust/crates/flate2"
+    },
+    {
       "path": "external/rust/crates/futures-util"
     },
     {
@@ -41,6 +47,12 @@
       "path": "external/rust/crates/getrandom"
     },
     {
+      "path": "external/rust/crates/hashbrown"
+    },
+    {
+      "path": "external/rust/crates/hashlink"
+    },
+    {
       "path": "external/rust/crates/jni"
     },
     {
@@ -95,173 +107,95 @@
       "path": "external/rust/crates/unicode-xid"
     },
     {
-      "path": "external/rust/crates/vulkano"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
+      "path": "external/rust/crates/virtio-drivers"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "external/rust/crates/vulkano"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/rust/crates/zerocopy"
     },
     {
-      "name": "cfg-if_test_src_lib"
+      "path": "external/uwb/src"
     },
     {
-      "name": "cfg-if_test_tests_xcrate"
+      "path": "packages/modules/DnsResolver"
     },
     {
-      "name": "diced_open_dice_cbor_test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "diced_sample_inputs_test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "diced_test"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "diced_utils_test"
+      "path": "packages/modules/Virtualization/encryptedstore"
     },
     {
-      "name": "diced_vendor_test"
+      "path": "packages/modules/Virtualization/libs/apexutil"
     },
     {
-      "name": "doh_unit_test"
+      "path": "packages/modules/Virtualization/libs/apkverify"
     },
     {
-      "name": "keystore2_crypto_test_rust"
+      "path": "packages/modules/Virtualization/libs/capabilities"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
+      "path": "packages/modules/Virtualization/libs/devicemapper"
     },
     {
-      "name": "keystore2_selinux_test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "libapkverify.integration_test"
+      "path": "system/keymint/derive"
     },
     {
-      "name": "libapkverify.test"
+      "path": "system/keymint/hal"
     },
     {
-      "name": "logger_device_unit_tests"
+      "path": "system/logging/rust"
     },
     {
-      "name": "logger_test_config_log_level"
+      "path": "system/security/diced"
     },
     {
-      "name": "logger_test_default_init"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "logger_test_env_log_level"
+      "path": "system/security/keystore2/legacykeystore"
     },
     {
-      "name": "logger_test_multiple_init"
+      "path": "system/security/keystore2/selinux"
     },
     {
-      "name": "microdroid_manager_test"
-    },
+      "path": "system/security/keystore2/src/crypto"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "rustBinderTest"
+      "name": "cfg-if_test_src_lib"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "cfg-if_test_tests_xcrate"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
       "name": "cfg-if_test_src_lib"
     },
     {
       "name": "cfg-if_test_tests_xcrate"
-    },
-    {
-      "name": "diced_open_dice_cbor_test"
-    },
-    {
-      "name": "diced_sample_inputs_test"
-    },
-    {
-      "name": "diced_test"
-    },
-    {
-      "name": "diced_utils_test"
-    },
-    {
-      "name": "diced_vendor_test"
-    },
-    {
-      "name": "doh_unit_test"
-    },
-    {
-      "name": "keystore2_crypto_test_rust"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_selinux_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_test_utils_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "rustBinderTest"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 19c5df8..c789f3b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,11 +1,7 @@
 {
   "apex-available": [
     "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.compos",
-    "com.android.resolv",
-    "com.android.uwb",
-    "com.android.virt"
+    "//apex_available:anyapex"
   ],
   "dependencies": true,
   "device": true,