commit 211ebf8ad2c47d1f142b4087120ad58bc8f54a39
author Yi-Yo Chiang <yochiang@google.com> Wed Jan 19 04:30:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 19 04:30:03 2022 +0000
tree f1d6da196c5dab7bb093bb36198b69a241fe90e1
parent bdff26b36412cf1af34af40e7ade57bc7e3de9dd
parent d4ad80ee44ffa74055e316abbf6a1d7ba18db3c4

unpack_bootimg: Export 'vendor_ramdisk' for vendor_boot v4 am: 33bf962400 am: 9d1f71ae36 am: d4ad80ee44

Original change: https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/1952244

Change-Id: I9776168bdfda14a27063394b536c319a202be1eb

unpack_bootimg.py

diff --git a/unpack_bootimg.py b/unpack_bootimg.py
index ae59429..2357e70 100755
--- a/unpack_bootimg.py
+++ b/unpack_bootimg.py
@@ -407,6 +407,9 @@
     ramdisk_offset_base = page_size * num_boot_header_pages
     image_info_list = []
 
+    image_info_list.append(
+        (ramdisk_offset_base, info.vendor_ramdisk_size, 'vendor_ramdisk'))
+
     if info.header_version > 3:
         info.vendor_ramdisk_table_size = unpack('I', args.boot_img.read(4))[0]
         vendor_ramdisk_table_entry_num = unpack('I', args.boot_img.read(4))[0]
@@ -449,9 +452,6 @@
             + num_vendor_ramdisk_table_pages)
         image_info_list.append((bootconfig_offset, info.vendor_bootconfig_size,
             'bootconfig'))
-    else:
-        image_info_list.append(
-            (ramdisk_offset_base, info.vendor_ramdisk_size, 'vendor_ramdisk'))
 
     dtb_offset = page_size * (num_boot_header_pages + num_boot_ramdisk_pages
                              ) # header + vendor_ramdisk