commit 5855930f06ddd4840df0df20d06bec499c8250c2
author Tao Bao <tbao@google.com> Wed Mar 06 14:53:04 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Mar 06 14:53:04 2019 -0800
tree 269a982edf8e3701455243a7aa72a93838419450
parent ea821ffe520f75216cba7dd0243a26fd89658973
parent dcfa7db1d096231297d10a6d5c2f1b48100f97d9

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

Change-Id: I0c4fdf31f94e841cdfb00df12845157d9ac750b8

mkbootimg/unpack_bootimg.py

diff --git a/mkbootimg/unpack_bootimg.py b/mkbootimg/unpack_bootimg.py
index 6b5d5d0..36a5f9f 100755
--- a/mkbootimg/unpack_bootimg.py
+++ b/mkbootimg/unpack_bootimg.py
@@ -103,10 +103,11 @@
                                  ) # header + kernel
     image_info_list.append((ramdisk_offset, ramdisk_size, 'ramdisk'))
 
-    second_offset = page_size * (
-        num_header_pages + num_kernel_pages + num_ramdisk_pages
-    )  # header + kernel + ramdisk
-    image_info_list.append((second_offset, second_size, 'second'))
+    if second_size > 0:
+        second_offset = page_size * (
+                num_header_pages + num_kernel_pages + num_ramdisk_pages
+                )  # header + kernel + ramdisk
+        image_info_list.append((second_offset, second_size, 'second'))
 
     if recovery_dtbo_size > 0:
         image_info_list.append((recovery_dtbo_offset, recovery_dtbo_size,