Merge "mkbootimg: extract to 'second' if size not 0" am: a3d394e9bb

am: 9130f5c950

Change-Id: Ia54d08b87b993c7aad6fba4d908d57d2ea22cbb5
This commit is contained in:
Tao Bao 2019-03-06 15:33:43 -08:00 committed by android-build-merger
commit 189e4a7c26

View file

@ -103,10 +103,11 @@ def unpack_bootimage(args):
) # header + kernel ) # header + kernel
image_info_list.append((ramdisk_offset, ramdisk_size, 'ramdisk')) image_info_list.append((ramdisk_offset, ramdisk_size, 'ramdisk'))
second_offset = page_size * ( if second_size > 0:
num_header_pages + num_kernel_pages + num_ramdisk_pages second_offset = page_size * (
) # header + kernel + ramdisk num_header_pages + num_kernel_pages + num_ramdisk_pages
image_info_list.append((second_offset, second_size, 'second')) ) # header + kernel + ramdisk
image_info_list.append((second_offset, second_size, 'second'))
if recovery_dtbo_size > 0: if recovery_dtbo_size > 0:
image_info_list.append((recovery_dtbo_offset, recovery_dtbo_size, image_info_list.append((recovery_dtbo_offset, recovery_dtbo_size,