Snap for 8782634 from 0bde26be89830bf89b08cc2210137ead2a0330bb to sdk-release

Change-Id: I1f07fff4f9d6da012b4157c0ec207fdfbbe8f1a5

3 files changed, 33 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index f9f123a..16ebcaa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,6 +52,10 @@ rust_library {
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_defaults {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8b8f493..c790aa2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -13,6 +13,12 @@
   ],
   "presubmit": [
     {
+      "name": "apkdmverity.test"
+    },
+    {
+      "name": "keystore2_legacy_blobs_test"
+    },
+    {
       "name": "keystore2_test"
     },
     {
@@ -25,6 +31,9 @@
       "name": "libapkverify.test"
     },
     {
+      "name": "libidsig.test"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
@@ -50,10 +59,19 @@
     },
     {
       "name": "minimal-lexical_test_tests_vec_tests"
+    },
+    {
+      "name": "virtualizationservice_device_test"
     }
   ],
   "presubmit-rust": [
     {
+      "name": "apkdmverity.test"
+    },
+    {
+      "name": "keystore2_legacy_blobs_test"
+    },
+    {
       "name": "keystore2_test"
     },
     {
@@ -66,6 +84,9 @@
       "name": "libapkverify.test"
     },
     {
+      "name": "libidsig.test"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
@@ -91,6 +112,9 @@
     },
     {
       "name": "minimal-lexical_test_tests_vec_tests"
+    },
+    {
+      "name": "virtualizationservice_device_test"
     }
   ]
 }
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
+}