Snap for 10453563 from 6e7f62e811f13487bdec87bbd22c071b5c7037f0 to mainline-uwb-releaseaml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-release

Change-Id: Id2cc06a7f3db97ae2de4bde1b680ff88bf653013

3 files changed, 17 insertions, 28 deletions

diff --git a/Android.bp b/Android.bp
index f9f123a..e4d49f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,6 +52,12 @@ rust_library {
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_defaults {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8b8f493..07bc9e6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -9,24 +9,18 @@
     },
     {
       "path": "external/rust/crates/rusticata-macros"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
     },
     {
-      "name": "libapkverify.integration_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "libapkverify.test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "microdroid_manager_test"
-    },
+      "path": "system/security/keystore2/legacykeystore"
+    }
+  ],
+  "presubmit": [
     {
       "name": "minimal-lexical_test_tests_integration_tests"
     },
@@ -54,21 +48,6 @@
   ],
   "presubmit-rust": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "minimal-lexical_test_tests_integration_tests"
     },
     {
diff --git a/cargo2android.json b/cargo2android.json
index d36fb44..8e490de 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,9 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "device": true,
   "run": true,
   "tests": true
-}
\ No newline at end of file
+}