Snap for 10453563 from 5ac15724c0d4a1ea2ed7e6b0da0af120e0070f7c to mainline-permission-releaseaml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release

Change-Id: I463617a4de9a8ad60a8e0e121195d0484b8a51b5

2 files changed, 13 insertions, 29 deletions

diff --git a/Android.bp b/Android.bp
index 554acac..5614204 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,11 @@ rust_library {
         "libhalf",
         "libserde",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
     vendor_available: true,
 }
 
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e3e6542..a757518 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -12,27 +12,24 @@
     },
     {
       "path": "external/rust/crates/unicode-xid"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "diced_test"
     },
     {
-      "name": "diced_vendor_test"
+      "path": "packages/modules/Virtualization/avmd"
     },
     {
-      "name": "keystore2_test"
+      "path": "packages/modules/Virtualization/microdroid_manager"
     },
     {
-      "name": "keystore2_test_utils_test"
+      "path": "system/security/diced"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "microdroid_manager_test"
-    },
+      "path": "system/security/keystore2/legacykeystore"
+    }
+  ],
+  "presubmit": [
     {
       "name": "serde_cbor_test_tests_bennofs"
     },
@@ -60,24 +57,6 @@
   ],
   "presubmit-rust": [
     {
-      "name": "diced_test"
-    },
-    {
-      "name": "diced_vendor_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_test_utils_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "serde_cbor_test_tests_bennofs"
     },
     {