From 41319b3abcc006913e6ff2da1100dcbd5051db53 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Tue, 22 Jan 2019 17:06:57 +0800 Subject: [PATCH] Add security patch level to hashtree footer of system Test: avbtool info_image --image system.img Bug: 122705329 Change-Id: I7b325a9a9aba2d98cb94c5fb8488b92f54e45dab --- core/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Makefile b/core/Makefile index 7d1c7ff20..7c060ff60 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2940,6 +2940,8 @@ BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --padding_size 4096 BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS += --padding_size 4096 BOARD_AVB_MAKE_VBMETA_VENDOR_IMAGE_ARGS += --padding_size 4096 +BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += --prop system_security_patch:$(PLATFORM_SECURITY_PATCH) + 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