commit 8faac3669e25e989ee8f0be854f906a44f68e23d
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 24 19:28:29 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 24 19:28:29 2019 +0000
tree cff937eb09930e46012f6e758903dd6466ecdda7
parent 22efcc114ec6916398edca11c9e30080d942886c
parent 41319b3abcc006913e6ff2da1100dcbd5051db53

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 646aaec..0bbaf12 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2976,6 +2976,8 @@
 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