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

Commit 2c898a05 authored by Spandan Das's avatar Spandan Das
Browse files

Use system's avbkey for system_other in target_files.zip 

This matches the behavior for the "main" system_other.img used for adb
sync

Test: presubmits
Change-Id: I08565cd64d5b1cd12cd0ef948f99252d05b54eeb
parent f5d7f1dc

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -2328,9 +2328,9 @@ $(if $(BOARD_AVB_ENABLE), \ 
  $(if $(filter $(2),system_other), \

    $(hide) echo "avb_system_other_hashtree_enable=$(BOARD_AVB_ENABLE)" >> $(1)$(newline) \

    $(hide) echo "avb_system_other_add_hashtree_footer_args=$(BOARD_AVB_SYSTEM_OTHER_ADD_HASHTREE_FOOTER_ARGS)" >> $(1)$(newline) \

    $(if $(BOARD_AVB_SYSTEM_OTHER_KEY_PATH),\

      $(hide) echo "avb_system_other_key_path=$(BOARD_AVB_SYSTEM_OTHER_KEY_PATH)" >> $(1)$(newline) \

      $(hide) echo "avb_system_other_algorithm=$(BOARD_AVB_SYSTEM_OTHER_ALGORITHM)" >> $(1)$(newline))) \

    $(if $(BOARD_AVB_SYSTEM_KEY_PATH),\

      $(hide) echo "avb_system_other_key_path=$(BOARD_AVB_SYSTEM_KEY_PATH)" >> $(1)$(newline) \

      $(hide) echo "avb_system_other_algorithm=$(BOARD_AVB_SYSTEM_ALGORITHM)" >> $(1)$(newline))) \

  $(if $(filter $(2),vendor), \

    $(hide) echo "avb_vendor_hashtree_enable=$(BOARD_AVB_ENABLE)" >> $(1)$(newline) \

    $(hide) echo "avb_vendor_add_hashtree_footer_args=$(BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS)" >> $(1)$(newline) \