Snap for 8512216 from 5a4999fb9eb13e3d9e132284cc00cfeab4dce522 to tm-frc-scheduling-releaset_frc_sch_330443040t_frc_sch_330443010android13-frc-scheduling-release

Change-Id: I27e6b9151784178ea853f0e7d20b0c106a036243

3 files changed, 15 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 8aa890f..514fc87 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,4 +50,8 @@ rust_library {
         "libnum_integer",
         "libnum_traits",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 08b3cb2..2ae3abf 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,6 +8,9 @@
       "name": "libapkverify.test"
     },
     {
+      "name": "libcert_request_validator_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     }
   ],
@@ -19,6 +22,9 @@
       "name": "libapkverify.test"
     },
     {
+      "name": "libcert_request_validator_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     }
   ]
diff --git a/cargo2android.json b/cargo2android.json
index b012d15..90c5a67 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,5 +1,9 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "device": true,
   "features": "std,clock",
   "run": true
-}
\ No newline at end of file
+}