From 240dcb8c458d29a0b00f7f6be55b2f4a0a4d86a5 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 22 Oct 2018 13:02:53 -0700 Subject: [PATCH] Only set set_hashtree_disabled_flag in top-level vbmeta.img. It's sufficient to have the flag in top-level vbmeta.img, and libavb expects no disable flag in chained vbmeta.img. Bug: 118115607 Test: `m vbmetaimage` with an -eng target using vbmeta_system.img. Check the flag in the generated image (`avbtool info_image --image vbmeta_system.img`). Change-Id: Ia429dd8a5cf0243e16ae305da210d3ea27c68abf --- core/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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