Snap for 10447354 from 65159860276e1dc2760d92261b814f1c4527e29f to mainline-resolv-releaseaml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000android14-mainline-resolv-release

Change-Id: If03acd6be3742dc97e26283a4fb6090454dbf251

3 files changed, 11 insertions, 19 deletions

diff --git a/Android.bp b/Android.bp
index 4d1a9e6..23d14ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,6 +69,12 @@ rust_library {
     rustlibs: [
         "libder_parser",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_test {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ecf0f4a..79b6da6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,29 +2,11 @@
 {
   "presubmit": [
     {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "oid-registry_test_src_lib"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "oid-registry_test_src_lib"
     }
   ]
diff --git a/cargo2android.json b/cargo2android.json
index 183bd42..322cd70 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,7 +1,11 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "copy-out": true,
   "device": true,
   "features": "crypto,x509",
   "run": true,
   "tests": true
-}
\ No newline at end of file
+}