commit 03b5bc0bba1086bd51333280d5df24d2646249fc
author Steve Muckle <smuckle@google.com> Fri Mar 20 00:07:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 20 00:07:08 2020 +0000
tree f548d3d5269d65f90c2fd034192505217525ecac
parent 627d958f6142b22a9627879f24e0abc1ed9fb677
parent 5bb77e1e36b995b8be9e24588ab20d4691e88c4d

fix size of vendor boot header am: 5bb77e1e36

Change-Id: Id1d07a6331bed74436fc4225deafd96050e1d97a

include/bootimg/bootimg.h

diff --git a/include/bootimg/bootimg.h b/include/bootimg/bootimg.h
index dff07f5..8c9f6ee 100644
--- a/include/bootimg/bootimg.h
+++ b/include/bootimg/bootimg.h
@@ -190,7 +190,7 @@
  * | dtb                 | q pages
  * +---------------------+
 
- * o = (2108 + page_size - 1) / page_size
+ * o = (2112 + page_size - 1) / page_size
  * p = (vendor_ramdisk_size + page_size - 1) / page_size
  * q = (dtb_size + page_size - 1) / page_size
  *

mkbootimg.py

diff --git a/mkbootimg.py b/mkbootimg.py
index b06d42d..9682033 100644
--- a/mkbootimg.py
+++ b/mkbootimg.py
@@ -82,7 +82,7 @@
     pad_file(args.output, BOOT_IMAGE_HEADER_V3_PAGESIZE)
 
 def write_vendor_boot_header(args):
-    VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2108
+    VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2112
     BOOT_MAGIC = 'VNDRBOOT'.encode()
 
     args.vendor_boot.write(pack('8s', BOOT_MAGIC))

unpack_bootimg.py

diff --git a/unpack_bootimg.py b/unpack_bootimg.py
index 628c19b..83c2bbe 100755
--- a/unpack_bootimg.py
+++ b/unpack_bootimg.py
@@ -24,7 +24,7 @@
 import os
 
 BOOT_IMAGE_HEADER_V3_PAGESIZE = 4096
-VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2108
+VENDOR_BOOT_IMAGE_HEADER_V3_SIZE = 2112
 
 def create_out_dir(dir_path):
     """creates a directory 'dir_path' if it does not exist"""