commit ed78c03c1efea4fd91e07991fdda508645e1b606
author Bill Rassieur <rassb@google.com> Thu May 27 20:03:06 2021 +0000
committer Bill Rassieur <rassb@google.com> Thu May 27 20:03:06 2021 +0000
tree 2225f66317e73fecc728172b211eae9e8f69f5d5
parent 80866550128d19f2c8d5d098ff76bf975ed0684b
parent 3878291c4d6ebd5873645ab7d578f1228fdaba08

Merge sc-mainline-prod to master.

Change-Id: I6c30036deff84130b609b526db6e622220f901f4

Android.bp

diff --git a/Android.bp b/Android.bp
index 228cf04..f1b717b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,7 @@
     ],
     apex_available: [
         "//apex_available:platform",
+        "com.android.compos",
         "com.android.virt",
     ],
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index b933b33..a78ac00 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
 {
   "apex-available": [
     "//apex_available:platform",
+    "com.android.compos",
     "com.android.virt"
   ],
   "dependencies": true,