commit 017916bf35d4d9fd34d7d915af2d90c8afe894bb
author Jooyung Han <jooyung@google.com> Tue Apr 20 03:57:19 2021 +0900
committer Jooyung Han <jooyung@google.com> Wed Apr 21 23:20:29 2021 +0900
tree e676fefff1bb18f50ef9006173e33e5ceccfc0f9
parent c36b18a443adeee179ab7caae872b1f91f1fc70a

Microdroid activates host APEXes

Host apexes are passed to microdroid via the payload composite image.
The payload composite image can be created by either
mk_payload_signature/mk_cdisk or mk_payload.

For now, microdroid expects two APEXes from the host:
- com.android.adbd
- com.android.sdkext

The exact set of host apexes for microdroid is TBD. The current set is
only for demonstration.

Bug: 181093750
Test: MicrodroidTestCase
Change-Id: I7fe33fe03ac94799a4e109b83286bfb39e44b882

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 9c201b4..8af22ff 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -44,15 +44,19 @@
     },
     binaries: [
         "fd_server",
-        "mk_cdisk",
-        "mk_microdroid_signature",
         "virtmanager",
         "vm",
+
+        // tools to create composite images
+        "mk_cdisk",
+        "mk_microdroid_signature",
+        "mk_payload",
     ],
     prebuilts: [
         "com.android.virt.init.rc",
         "microdroid_cdisk.json",
         "microdroid_cdisk_env.json",
+        "microdroid_payload.json",
         "microdroid_uboot_env",
         "microdroid_bootloader",
     ],