commit 3c7fec0e10374c8048591bda81c0b66966af83ce
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:07:44 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:07:44 2023 +0000
tree ea0b6205a5b138249d63da8a5cf2c218703268b0
parent fd9ff2a7b7ac2895b6f3266cfbf500cf36c1cda1
parent 6e7f62e811f13487bdec87bbd22c071b5c7037f0

Snap for 10453563 from 6e7f62e811f13487bdec87bbd22c071b5c7037f0 to mainline-permission-release

Change-Id: I2588736f66ca618e94971b4afec1c5bb4ca54cb6

Android.bp

diff --git a/Android.bp b/Android.bp
index f9f123a..e4d49f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,6 +52,12 @@
         "default",
         "std",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_defaults {

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8b8f493..07bc9e6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -9,25 +9,19 @@
     },
     {
       "path": "external/rust/crates/rusticata-macros"
+    },
+    {
+      "path": "packages/modules/Virtualization/virtualizationmanager"
+    },
+    {
+      "path": "system/security/keystore2"
+    },
+    {
+      "path": "system/security/keystore2/legacykeystore"
     }
   ],
   "presubmit": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "minimal-lexical_test_tests_integration_tests"
     },
     {
@@ -54,21 +48,6 @@
   ],
   "presubmit-rust": [
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libapkverify.integration_test"
-    },
-    {
-      "name": "libapkverify.test"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "minimal-lexical_test_tests_integration_tests"
     },
     {

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