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

Change-Id: Ibd384df9e3e1d6e184019f926786ece16580f580

2 files changed, 11 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index e18e9ee..b0265f3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,4 +32,10 @@ rust_library {
         "libtermcolor",
         "libunicode_width",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d7399cf..86bba35 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,31 +1,17 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "diced_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "keystore2_test"
+      "path": "system/security/diced"
     },
     {
-      "name": "keystore2_vintf_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "legacykeystore_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "diced_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
+      "path": "system/security/keystore2/legacykeystore"
     }
   ]
 }