commit 425f51e2ff8633626faf436aae17cdd332149d80
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 01:04:27 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 01:04:27 2023 +0000
tree 6975cf3a6dad2d5014f6ed849363db427d4a1c25
parent 84edaed69ddcc17cc6daa57d66b0da27953371ff
parent b2f00b21838fac4b86cc24a3b3fd99060ad7e004

Snap for 10447354 from b2f00b21838fac4b86cc24a3b3fd99060ad7e004 to mainline-cellbroadcast-release

Change-Id: Id77f5b3a9c1d48d8f3851bc5b0a067cac742e2bc

Android.bp

diff --git a/Android.bp b/Android.bp
index 2034097..a785207 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,10 +51,10 @@
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
-        "com.android.compos",
-        "com.android.virt",
+        "//apex_available:anyapex",
     ],
+    product_available: true,
+    vendor_available: true,
     min_sdk_version: "29",
 }
 

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index af52a19..26eebef 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,6 +11,9 @@
       "path": "external/rust/crates/crossbeam-epoch"
     },
     {
+      "path": "external/rust/crates/hashbrown"
+    },
+    {
       "path": "external/rust/crates/tinytemplate"
     },
     {
@@ -21,27 +24,30 @@
     },
     {
       "path": "external/rust/crates/vulkano"
+    },
+    {
+      "path": "packages/modules/Virtualization/apkdmverity"
+    },
+    {
+      "path": "packages/modules/Virtualization/libs/capabilities"
+    },
+    {
+      "path": "packages/modules/Virtualization/libs/devicemapper"
+    },
+    {
+      "path": "packages/modules/Virtualization/microdroid_manager"
+    },
+    {
+      "path": "packages/modules/Virtualization/zipfuse"
     }
   ],
   "presubmit": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
       "name": "scopeguard_test_src_lib"
     }
   ],
   "presubmit-rust": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "apkdmverity.test"
-    },
-    {
       "name": "scopeguard_test_src_lib"
     }
   ]

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 4384672..0bf05f4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,13 +1,8 @@
 {
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.bluetooth",
-    "com.android.compos",
-    "com.android.virt"
-  ],
   "dependencies": true,
   "device": true,
   "min-sdk-version": "29",
   "run": true,
-  "tests": true
+  "tests": true,
+  "vendor-available": true
 }