Merge "Add security patch level to hashtree footer of system"

am: 8faac3669e

Change-Id: I96415c5a24eb4c3fc27e8ead84b6a76b6bd96f0c
This commit is contained in:
Hsin-Yi Chen 2019-01-24 11:57:10 -08:00 committed by android-build-merger
commit 3e0a271f61
1 changed files with 2 additions and 0 deletions

View File

@ -2976,6 +2976,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