commit 01bd1d34db83d9f59c67f282e1ff0a113f28a5a2
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 07 19:44:37 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 07 19:44:37 2016 +0000
tree c7545203cc3d57379fc32fda7686eb434cc43d22
parent 24dd78a2d706a383d4b4cead2343875b90dd09eb
parent b2fea5878c04de0921b8a8cc849d45e064aed126

Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9a6ced4..a1d483b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1043,6 +1043,12 @@
     $(BOOT_SIGNER) /recovery $(1) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1))
   $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \
     $(VBOOT_SIGNER) $(FUTILITY) $(1).unsigned $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_SUBKEY).vbprivk $(1).keyblock $(1))
+  $(if $(and $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),$(filter true,$(BOARD_AVB_ENABLE))), \
+      $(hide) $(AVBTOOL) add_hash_footer \
+        --image $(1) \
+        --partition_size $(BOARD_BOOTIMAGE_PARTITION_SIZE) \
+        --partition_name boot $(INTERNAL_AVB_SIGNING_ARGS) \
+        $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS))
   $(if $(filter true,BOARD_USES_RECOVERY_AS_BOOT), \
     $(hide) $(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE)), \
     $(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)))