commit 3ba5dd69fa7c1f1cbb181255e596fbc13dc86e87
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:44:44 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:44:44 2023 +0000
tree 7dd8cd91c57e22ec0e08ab5f4413073c4b45f8b6
parent 8f660f2b0fbaec5371e7c8c72b07fe2fd5f629ed
parent f5f1df598aa69835353c1fd2dfe07b0821f6da70

Snap for 10453563 from f5f1df598aa69835353c1fd2dfe07b0821f6da70 to mainline-art-release

Change-Id: I76213b3bf7eedc5c42b3877db030affbd1f7237b

Android.bp

diff --git a/Android.bp b/Android.bp
index f2c723a..ae9e651 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,4 +49,10 @@
         "default",
         "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 e4ec3b3..23bbdf9 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,22 +3,12 @@
   "imports": [
     {
       "path": "external/rust/crates/libsqlite3-sys"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "keystore2_test"
     },
     {
-      "name": "legacykeystore_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "keystore2_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "legacykeystore_test"
+      "path": "system/security/keystore2/legacykeystore"
     }
   ]
 }