Snap for 10453563 from 4b31aa3ec3722150a12b6ae2c549cd20e73f96df to mainline-extservices-release

Change-Id: I08c34e181e4374891a8bc9f60aa5f092fc051b4b

Android.bp

diff --git a/Android.bp b/Android.bp
index 412407c..4b50bf1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,6 +50,12 @@
     rustlibs: [
         "libnom",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_test {

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index aaad5d5..e72fdb6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,29 +7,11 @@
   ],
   "presubmit": [
     {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "rusticata-macros_test_src_lib"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "rusticata-macros_test_src_lib"
     }
   ]

cargo2android.json

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
+}