Revert "unpack_bootimg: Export 'vendor_ramdisk' for vendor_boot v4" am: f85a2fd564 am: ccf44dde20 am: fa9f1fa517 am: a6cff18639
Original change: https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/2181573
Change-Id: Id6b1bdd0a263a05441d003efb166ad44dc4dbf28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/unpack_bootimg.py b/unpack_bootimg.py
index 462190f..a3f1a50 100755
--- a/unpack_bootimg.py
+++ b/unpack_bootimg.py
@@ -404,9 +404,6 @@
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', boot_img.read(4))[0]
vendor_ramdisk_table_entry_num = unpack('I', boot_img.read(4))[0]
@@ -449,6 +446,9 @@
+ 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