Snap for 10453563 from 7e0065a71fabd62dd508bb8651a57b51865996db to mainline-extservices-release

Change-Id: Id35d5ceab354f755a449aca7e04e70789f6d020f

Android.bp

diff --git a/Android.bp b/Android.bp
index 3e1e487..d9679a9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,4 +49,10 @@
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: ["std"],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    product_available: true,
+    vendor_available: true,
 }

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 91f37bf..5953440 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,19 +1,11 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "keystore2_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "legacykeystore_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
+      "path": "system/security/keystore2/legacykeystore"
     }
   ]
 }