commit 5f42d56a2444ece68053867f2bfb136e19d246b5
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 23 06:40:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 06:40:58 2019 +0000
tree 6edfd74db30130e6c9319aced8a6505b40d4f266
parent bf07f0085b205b012a171813d26090711a699483
parent b994524ea6b80d28ef613698d81136574f88c510

Merge "Inject boot patch level into boot-debug.img"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 8fddc09..e9cd51f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2186,7 +2186,8 @@
 	  $(AVBTOOL) add_hash_footer \
 	    --image $@ \
 	    --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) \
-	    --partition_name boot $(PRIVATE_AVB_DEBUG_BOOT_SIGNING_ARGS), \
+	    --partition_name boot $(PRIVATE_AVB_DEBUG_BOOT_SIGNING_ARGS) \
+	    $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS), \
 	  $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE)))
 
 .PHONY: bootimage_debug-nodeps
@@ -2198,7 +2199,8 @@
 	  $(AVBTOOL) add_hash_footer \
 	    --image $(INSTALLED_DEBUG_BOOTIMAGE_TARGET) \
 	    --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) \
-	    --partition_name boot $(PRIVATE_AVB_DEBUG_BOOT_SIGNING_ARGS), \
+	    --partition_name boot $(PRIVATE_AVB_DEBUG_BOOT_SIGNING_ARGS) \
+	    $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS), \
 	  $(call assert-max-image-size,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE)))
 
 endif # TARGET_NO_KERNEL