Merge TP1A.210812.002
Bug: 198367246
Change-Id: I5e0bf861c184a3b7e43c0e339417a7ee6fb3f449
diff --git a/Android.bp b/Android.bp
index 4339cae..2ca1e2f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -73,6 +73,7 @@
cfgs: ["bitflags_const_fn"],
apex_available: [
"//apex_available:platform",
+ "com.android.compos",
"com.android.virt",
],
}
diff --git a/cargo2android.json b/cargo2android.json
index ac56e26..a4a2e17 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,6 +1,7 @@
{
"apex-available": [
"//apex_available:platform",
+ "com.android.compos",
"com.android.virt"
],
"dependencies": true,