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

Change-Id: I5c330e13eb66f48a77e9c524e8f767b223609ce8

3 files changed, 31 insertions, 40 deletions

diff --git a/Android.bp b/Android.bp
index 20c4928..3e97f84 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,12 +58,13 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
+        "com.android.btservices",
         "com.android.compos",
         "com.android.resolv",
         "com.android.uwb",
         "com.android.virt",
     ],
+    product_available: true,
     vendor_available: true,
     min_sdk_version: "29",
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 481ff59..a511d07 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,9 +8,24 @@
       "path": "external/rust/crates/anyhow"
     },
     {
+      "path": "external/rust/crates/async-stream"
+    },
+    {
       "path": "external/rust/crates/base64"
     },
     {
+      "path": "external/rust/crates/clap/2.33.3"
+    },
+    {
+      "path": "external/rust/crates/futures-channel"
+    },
+    {
+      "path": "external/rust/crates/futures-executor"
+    },
+    {
+      "path": "external/rust/crates/futures-test"
+    },
+    {
       "path": "external/rust/crates/futures-util"
     },
     {
@@ -45,70 +60,45 @@
     },
     {
       "path": "external/rust/crates/unicode-xid"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/uwb/src"
     },
     {
-      "name": "doh_unit_test"
+      "path": "packages/modules/DnsResolver"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/apkdmverity"
     },
     {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "name": "rustBinderTest"
-    },
-    {
-      "name": "virtualizationservice_device_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "doh_unit_test"
+      "path": "packages/modules/Virtualization/encryptedstore"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "libapkverify.integration_test"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "libapkverify.test"
+      "path": "system/keymint/hal"
     },
     {
-      "name": "microdroid_manager_test"
+      "path": "system/security/diced"
     },
     {
-      "name": "rustBinderTest"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "path": "system/security/keystore2/legacykeystore"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 6adfa56..f692b87 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.resolv",
     "com.android.uwb",