diff --git a/core/Makefile b/core/Makefile index fe728d6f1c..da1fbc2e00 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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