commit 7851501f2bec2e4a40580666118eae743be0e42b
author Jiyong Park <jiyong@google.com> Tue Apr 13 17:43:10 2021 +0900
committer Jiyong Park <jiyong@google.com> Tue Apr 13 17:44:44 2021 +0900
tree 19a224842f4077c198390aae552681d42d086ee3
parent 66863f22d053d692b2d7b20d71ece7753d1e2867

Move uboot_env.img to a new composite disk

u-boot is updated to look for the environment partition in the second
disk.

Bug: 183006588
Test: atest MicrodroidHostTestCases
Change-Id: I2e716bb85d4762f700ea7479c68ffbcfd150857c

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index bc9e084..41d2f62 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -51,6 +51,7 @@
     prebuilts: [
         "com.android.virt.init.rc",
         "microdroid_cdisk.json",
+        "microdroid_cdisk_env.json",
         "microdroid_uboot_env",
         "microdroid_bootloader",
     ],