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

Change-Id: I247bda5ff6b8341efb9587b1daace49cc79ee0fa

3 files changed, 20 insertions, 137 deletions

diff --git a/Android.bp b/Android.bp
index 5eafb67..7e36313 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,12 +67,9 @@ rust_library {
     edition: "2015",
     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 b9ed59b..e1d670f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,22 +2,13 @@
 {
   "imports": [
     {
-      "path": "external/rust/crates/android_logger"
-    },
-    {
       "path": "external/rust/crates/base64"
     },
     {
-      "path": "external/rust/crates/crossbeam-deque"
-    },
-    {
-      "path": "external/rust/crates/crossbeam-epoch"
-    },
-    {
-      "path": "external/rust/crates/crossbeam-queue"
+      "path": "external/rust/crates/clap/2.33.3"
     },
     {
-      "path": "external/rust/crates/crossbeam-utils"
+      "path": "external/rust/crates/hashbrown"
     },
     {
       "path": "external/rust/crates/jni"
@@ -51,148 +42,46 @@
     },
     {
       "path": "external/rust/crates/xml-rs"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "diced_open_dice_cbor_test"
+      "path": "packages/modules/DnsResolver"
     },
     {
-      "name": "diced_sample_inputs_test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "diced_test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "diced_utils_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "diced_vendor_test"
+      "path": "packages/modules/Virtualization/vm"
     },
     {
-      "name": "doh_unit_test"
+      "path": "system/keymint/hal"
     },
     {
-      "name": "keystore2_km_compat_test"
+      "path": "system/security/diced"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "keystore2_selinux_test"
+      "path": "system/security/keystore2/legacykeystore"
     },
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_test_utils_test"
-    },
+      "path": "system/security/keystore2/selinux"
+    }
+  ],
+  "presubmit": [
     {
       "name": "lazy_static_test_tests_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": "virtualizationservice_device_test"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
-      "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_km_compat_test"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_selinux_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_test_utils_test"
-    },
-    {
       "name": "lazy_static_test_tests_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": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index c775247..b634ad1 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"
   ],
   "dependency-blocklist": [
     "doc_comment"
@@ -17,5 +13,6 @@
     "tests/no_std.rs"
   ],
   "tests": true,
-  "vendor-available": true
+  "vendor-available": true,
+  "product-available": true
 }