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

Commit f43c09ad authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "Support signing custom_images with AVB" am: e09809a3 am: d8c0bb8f am: e0474219 

am: 90f4777c

Change-Id: I3c647c2b2ed866755d3728cb64a8f7c08c3719f1
parents 287b9a4a 90f4777c

core/tasks/tools/build_custom_image.mk

+15 −8
Original line number Diff line number Diff line
@@ -62,12 +62,16 @@ $(foreach f,$(CUSTOM_IMAGE_COPY_FILES),\ 
  $(eval my_image_copy_files += $(src))\

  $(eval my_copy_pairs += $(src):$(my_staging_dir)/$(word 2,$(pair))))



ifndef CUSTOM_IMAGE_AVB_KEY_PATH

# If key path isn't specified, use the default signing args.

my_avb_signing_args := $(INTERNAL_AVB_SIGNING_ARGS)

else

my_avb_signing_args := \

  --algorithm $(CUSTOM_IMAGE_AVB_ALGORITHM) --key $(CUSTOM_IMAGE_AVB_KEY_PATH)

ifdef CUSTOM_IMAGE_AVB_KEY_PATH

ifndef CUSTOM_IMAGE_AVB_ALGORITHM

  $(error CUSTOM_IMAGE_AVB_ALGORITHM is not defined)

endif

ifndef CUSTOM_IMAGE_AVB_ROLLBACK_INDEX

  $(error CUSTOM_IMAGE_AVB_ROLLBACK_INDEX is not defined)

endif

# set rollback_index via footer args

CUSTOM_IMAGE_AVB_ADD_HASH_FOOTER_ARGS += --rollback_index $(CUSTOM_IMAGE_AVB_ROLLBACK_INDEX)

CUSTOM_IMAGE_AVB_ADD_HASHTREE_FOOTER_ARGS += --rollback_index $(CUSTOM_IMAGE_AVB_ROLLBACK_INDEX)

endif



$(my_built_custom_image): PRIVATE_INTERMEDIATES := $(intermediates)
@@ -84,7 +88,8 @@ $(my_built_custom_image): PRIVATE_VERITY_KEY := $(PRODUCTS.$(INTERNAL_PRODUCT).P 
$(my_built_custom_image): PRIVATE_VERITY_BLOCK_DEVICE := $(CUSTOM_IMAGE_VERITY_BLOCK_DEVICE)

$(my_built_custom_image): PRIVATE_DICT_FILE := $(CUSTOM_IMAGE_DICT_FILE)

$(my_built_custom_image): PRIVATE_AVB_AVBTOOL := $(AVBTOOL)

$(my_built_custom_image): PRIVATE_AVB_SIGNING_ARGS := $(my_avb_signing_args)

$(my_built_custom_image): PRIVATE_AVB_KEY_PATH := $(CUSTOM_IMAGE_AVB_KEY_PATH)

$(my_built_custom_image): PRIVATE_AVB_ALGORITHM:= $(CUSTOM_IMAGE_AVB_ALGORITHM)

$(my_built_custom_image): PRIVATE_AVB_HASH_ENABLE := $(CUSTOM_IMAGE_AVB_HASH_ENABLE)

$(my_built_custom_image): PRIVATE_AVB_ADD_HASH_FOOTER_ARGS := $(CUSTOM_IMAGE_AVB_ADD_HASH_FOOTER_ARGS)

$(my_built_custom_image): PRIVATE_AVB_HASHTREE_ENABLE := $(CUSTOM_IMAGE_AVB_HASHTREE_ENABLE)
@@ -131,7 +136,9 @@ $(my_built_custom_image): $(INTERNAL_USERIMAGES_DEPS) $(my_built_modules) $(my_i 
	$(if $(PRIVATE_SUPPORT_VERITY_FEC),\

	  $(hide) echo "verity_fec=$(PRIVATE_SUPPORT_VERITY_FEC)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt)

	$(hide) echo "avb_avbtool=$(PRIVATE_AVB_AVBTOOL)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt

	$(hide) echo "avb_signing_args=$(PRIVATE_AVB_SIGNING_ARGS)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt

	$(if $(PRIVATE_AVB_KEY_PATH),\

	  $(hide) echo "avb_key_path=$(PRIVATE_AVB_KEY_PATH)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt;\

	    echo "avb_algorithm=$(PRIVATE_AVB_ALGORITHM)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt)

	$(if $(PRIVATE_AVB_HASH_ENABLE),\

	  $(hide) echo "avb_hash_enable=$(PRIVATE_AVB_HASH_ENABLE)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt;\

	    echo "avb_add_hash_footer_args=$(PRIVATE_AVB_ADD_HASH_FOOTER_ARGS)" >> $(PRIVATE_INTERMEDIATES)/image_info.txt)