Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev

am: 7f0e79b146

Change-Id: I6c80f285a50facbe1fc44f9a264775206cefcbc1
This commit is contained in:
Bowgo Tsai 2017-06-14 04:20:25 +00:00 committed by android-build-merger
commit dd6403d8ff

View file

@ -1851,6 +1851,8 @@ INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \
--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