commit adfb76c3cf021ae645341e94f8e85ac46d6791ec
author Jooyung Han <jooyung@google.com> Mon Jun 28 17:29:30 2021 +0900
committer Jooyung Han <jooyung@google.com> Wed Jun 30 09:52:38 2021 +0900
tree 8ba2386fcbe7b82e16824def0f4fb28898ca6d47
parent 21e9b928ef7683ecbfc6fff17a5b588c791d385a

microdroid: create payload disk image with system apexes

Virtualizationservice creates a pyload disk image only for "microdroid"
and it adds necessary system apexes automatically.

Removed those apexes from vm_config.json files in testapk and compos
apk.

Bug: 190503456
Bug: 192200378
Test: adb root && adb shell setenforce 0
Test: adb shell /apex/com.android.virt/bin/vm run-app \
  /apex/com.android.compos/app/CompOSPayloadApp/CompOSPayloadApp.apk \
  /apex/com.android.compos/etc/CompOSPayloadApp.apk.idsig \
  assets/vm_config.json
Change-Id: I7d472ea0876f2571ca6767e2ba0b5773a951368b

compos/apex/Android.bp

diff --git a/compos/apex/Android.bp b/compos/apex/Android.bp
index 9942e09..1fffa2e 100644
--- a/compos/apex/Android.bp
+++ b/compos/apex/Android.bp
@@ -48,6 +48,6 @@
     ],
 
     prebuilts: [
-        "compos_payload_config",
+        "CompOSPayloadApp.apk.idsig",
     ],
 }