Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c808d308 authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition."... 

Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition." am: f63b7f9c am: a23e6a0b
am: 18fce00d

Change-Id: If122ce9cec0ddfe4e9795f8eeb951d119187ae2d
parents dba3a408 18fce00d

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2767,8 +2767,10 @@ endif 
# - not-chained: The --include_descriptors_from_image option for make_vbmeta_image

#   will include the kernel cmdline descriptor from system.img into vbmeta.img

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

ifeq ($(filter system, $(BOARD_SUPER_PARTITION_PARTITION_LIST)),)

BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += --setup_as_rootfs_from_kernel

endif

endif



BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --padding_size 4096

BOARD_AVB_MAKE_VBMETA_MAINLINE_IMAGE_ARGS += --padding_size 4096