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

Commit abe7ee15 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Only set set_hashtree_disabled_flag in top-level vbmeta.img." 

am: b64a0f3b

Change-Id: Ic034cf09bdfeb45d339cc9012b756182a4e60892
parents 11797c1c b64a0f3b

core/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2779,9 +2779,8 @@ BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS += --padding_size 4096 
BOARD_AVB_MAKE_VBMETA_VENDOR_IMAGE_ARGS += --padding_size 4096



ifeq (eng,$(filter eng, $(TARGET_BUILD_VARIANT)))

# We only need the flag in top-level vbmeta.img.

BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag

BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS += --set_hashtree_disabled_flag

BOARD_AVB_MAKE_VBMETA_VENDOR_IMAGE_ARGS += --set_hashtree_disabled_flag

endif



ifdef BOARD_AVB_ROLLBACK_INDEX