commit 15002aa2cecdf577c2045faf12939285650fc249
author Victor Hsieh <victorhsieh@google.com> Wed Oct 13 20:01:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 13 20:01:35 2021 +0000
tree 5cb98d913628f6be1d7418242c852ea8b9834803
parent 0290cc2c0276748458a0615e1f993278015a7b2e
parent 35c4e7bb5808a840207591eee44cd904afe93d2c

Merge "Mount *CLASSPATH APEXes in CompOS"

compos/apk/assets/vm_config.json

diff --git a/compos/apk/assets/vm_config.json b/compos/apk/assets/vm_config.json
index 9c71942..3a6eff4 100644
--- a/compos/apk/assets/vm_config.json
+++ b/compos/apk/assets/vm_config.json
@@ -16,6 +16,15 @@
     },
     {
       "name": "com.android.compos"
+    },
+    {
+      "name": "{DEX2OATBOOTCLASSPATH}"
+    },
+    {
+      "name": "{BOOTCLASSPATH}"
+    },
+    {
+      "name": "{SYSTEMSERVERCLASSPATH}"
     }
   ]
 }
\ No newline at end of file

compos/apk/assets/vm_test_config.json

diff --git a/compos/apk/assets/vm_test_config.json b/compos/apk/assets/vm_test_config.json
index 54a0aac..22f8293 100644
--- a/compos/apk/assets/vm_test_config.json
+++ b/compos/apk/assets/vm_test_config.json
@@ -13,6 +13,15 @@
         },
         {
             "name": "com.android.compos"
+        },
+        {
+            "name": "{DEX2OATBOOTCLASSPATH}"
+        },
+        {
+            "name": "{BOOTCLASSPATH}"
+        },
+        {
+            "name": "{SYSTEMSERVERCLASSPATH}"
         }
     ]
 }
\ No newline at end of file