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

Commit b64a0f3b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 4c95ffa8 240dcb8c

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