Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa126abe authored by David Zeuthen's avatar David Zeuthen Committed by android-build-merger
Browse files

Merge "Make AVB work when BOARD_USES_RECOVERY_AS_BOOT is set to true." am: 01bd1d34 

am: ec6fe806

Change-Id: I48f5fd6fd8c1334679117d735a1a28a76e0edf3c
parents 30858857 ec6fe806

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -1043,6 +1043,12 @@ define build-recoveryimage-target 
    $(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)))