commit 53cf99992307e10260a310646250afcffdde35af
author Bowgo Tsai <bowgotsai@google.com> Tue Jun 13 11:27:06 2017 +0800
committer Bowgo Tsai <bowgotsai@google.com> Wed Jun 14 10:14:24 2017 +0800
tree c13024b850f7d984772dc9546e607b0a469dfc40
parent 46e6c931e491fae32660d1b09c0d6216924c0859

Align size of vbmeta image to 4k boundary

Adding option "--padding_size 4096" when making vbmeta.img.

Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
Merged-In: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
(cherry picked from commit 7cd30041e90ea87a3c30a78fffb08dfe39bbc7a7)

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index af15f51..8b4f503 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1850,6 +1850,8 @@
     --include_descriptors_from_image $(INSTALLED_DTBOIMAGE_TARGET)
 endif
 
+INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += --padding_size 4096
+
 ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
 INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += --setup_rootfs_from_kernel $(BUILT_SYSTEMIMAGE)
 endif