commit ed0fd2d0b97ebb05aacc3e022f641506e96ae2cc
author Andrew Scull <ascull@google.com> Mon Jun 13 13:22:41 2022 +0000
committer Andrew Scull <ascull@google.com> Mon Jun 13 13:50:26 2022 +0000
tree 73b8eea40dc2a9e34a5def4a32e40c6f3577545d
parent 552251975dd2c1692f61f9d60b286a9542652930

Revert "Migrate to avb_add_hash_footer"

This reverts commit 26eca1fd2f8d13cd44fbff2ff031eaa4352fd534.

Reason for revert: Broke x86 build

Change-Id: Ia73721f073268aa059f577ab83afd3034c8c3ee5

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index fb8de4c..0f30c67 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -3,16 +3,12 @@
 }
 
 microdroid_filesystem_images = [
-    "microdroid_boot-5.10",
-    "microdroid_bootconfig_app_debuggable",
-    "microdroid_bootconfig_full_debuggable",
-    "microdroid_bootconfig_normal",
-    "microdroid_init_boot",
     "microdroid_super",
-    "microdroid_uboot_env",
+    "microdroid_boot-5.10",
+    "microdroid_init_boot",
+    "microdroid_vendor_boot-5.10",
     "microdroid_vbmeta",
     "microdroid_vbmeta_bootconfig",
-    "microdroid_vendor_boot-5.10",
 ]
 
 apex {
@@ -64,8 +60,12 @@
     prebuilts: [
         "com.android.virt.init.rc",
         "microdroid.json",
+        "microdroid_uboot_env",
         "microdroid_bootloader",
         "microdroid_bootloader.avbpubkey",
+        "microdroid_bootconfig_normal",
+        "microdroid_bootconfig_app_debuggable",
+        "microdroid_bootconfig_full_debuggable",
     ],
     file_contexts: ":com.android.virt-file_contexts",
     canned_fs_config: "canned_fs_config",