[automerged blank] Make crate vendor available 2p: 57e7b291ab

Blank merge reason: Change-Id Id9d56df3dbf101899054a42e0eba6e024eb9de7e with SHA-1 6faa01ec63 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/getrandom/+/20341511

Bug: 235777894
Bug: 245578454
Change-Id: I36f9f92c57a73506c70096688c43a2e123f1ca14
Merged-In: Id9d56df3dbf101899054a42e0eba6e024eb9de7e

Android.bp

diff --git a/Android.bp b/Android.bp
index 27336fc..9f23d16 100644
--- a/Android.bp
+++ b/Android.bp
@@ -108,7 +108,7 @@
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.virt",
+        "//apex_available:anyapex",
     ],
     vendor_available: true,
 }

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 42e04b4..29bd93a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -67,6 +67,12 @@
       "name": "getrandom_test_tests_rdrand"
     },
     {
+      "name": "keystore2_client_tests"
+    },
+    {
+      "name": "keystore2_legacy_blobs_test"
+    },
+    {
       "name": "keystore2_test"
     },
     {
@@ -102,6 +108,12 @@
       "name": "getrandom_test_tests_rdrand"
     },
     {
+      "name": "keystore2_client_tests"
+    },
+    {
+      "name": "keystore2_legacy_blobs_test"
+    },
+    {
       "name": "keystore2_test"
     },
     {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 8945bb0..305a6eb 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,8 +1,4 @@
 {
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
   "dependencies": true,
   "device": true,
   "features": "std",