Merge "Align size of vbmeta image to 4k boundary" am: 6b126fb7bc

am: e7151a57aa

Change-Id: I0a4dbbe18574e1c2037b185c7e3794033da2c974
This commit is contained in:
Bowgo Tsai 2017-06-14 02:14:41 +00:00 committed by android-build-merger
commit e408b4ceb2

View file

@ -1854,6 +1854,8 @@ INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += \
--include_descriptors_from_image $(INSTALLED_DTBOIMAGE_TARGET) --include_descriptors_from_image $(INSTALLED_DTBOIMAGE_TARGET)
endif endif
INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += --padding_size 4096
ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += --setup_rootfs_from_kernel $(BUILT_SYSTEMIMAGE) INTERNAL_AVB_MAKE_VBMETA_IMAGE_ARGS += --setup_rootfs_from_kernel $(BUILT_SYSTEMIMAGE)
endif endif