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

Commit 036c6a0a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add macro to support prebuilt vendor_vboot.img" into main am: a95db664 

Original change: https://android-review.googlesource.com/c/platform/build/+/3141983



Change-Id: Icd70356dd6443f4e38859291bb21e81aa0c19632
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36299a77 a95db664

core/Makefile

+28 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,30 @@ endif 
$(call declare-1p-container,$(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_VENDOR_BOOTIMAGE_TARGET),$(INTERNAL_VENDOR_RAMDISK_TARGET) $(INSTALLED_DTB_IMAGE_TARGET) $(INTERNAL_VENDOR_RAMDISK_FRAGMENT_TARGETS) $(INTERNAL_VENDOR_BOOTCONDIG_TARGET),$(PRODUCT_OUT)/:/)

VENDOR_NOTICE_DEPS += $(INSTALLED_VENDOR_BOOTIMAGE_TARGET)



else # BUILDING_VENDOR_BOOT_IMAGE not defined, use prebuilt image



ifdef BOARD_PREBUILT_VENDOR_BOOTIMAGE

INTERNAL_PREBUILT_VENDOR_BOOTIMAGE := $(BOARD_PREBUILT_VENDOR_BOOTIMAGE)

INSTALLED_VENDOR_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/vendor_boot.img



ifeq ($(BOARD_AVB_ENABLE),true)

$(INSTALLED_VENDOR_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_VENDOR_BOOTIMAGE) $(AVBTOOL) $(BOARD_AVB_VENDOR_BOOT_KEY_PATH)

	cp $(INTERNAL_PREBUILT_VENDOR_BOOTIMAGE) $@

	chmod +w $@

	$(AVBTOOL) add_hash_footer \

	    --image $@ \

	    $(call get-partition-size-argument,$(BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE)) \

	    --partition_name vendor_boot $(INTERNAL_AVB_VENDOR_BOOT_SIGNING_ARGS) \

	    $(BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS)

else

$(INSTALLED_VENDOR_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_VENDOR_BOOTIMAGE)

	cp $(INTERNAL_PREBUILT_VENDOR_BOOTIMAGE) $@



endif # BOARD_AVB_ENABLE

$(call declare-1p-container,$(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_VENDOR_BOOTIMAGE_TARGET),$(INTERNAL_PREBUILT_VENDOR_BOOTIMAGE),$(PRODUCT_OUT)/:/)

endif # BOARD_PREBUILT_VENDOR_BOOTIMAGE

endif # BUILDING_VENDOR_BOOT_IMAGE



# -----------------------------------------------------------------
@@ -6661,6 +6685,10 @@ ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true) 
	@# If breakpad symbols have been generated, add them to the zip.

	$(hide) cp -R $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD

endif

ifdef BOARD_PREBUILT_VENDOR_BOOTIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_VENDOR_BOOTIMAGE_TARGET) $(zip_root)/IMAGES/

endif

ifdef BOARD_PREBUILT_VENDORIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

	$(hide) cp $(INSTALLED_VENDORIMAGE_TARGET) $(zip_root)/IMAGES/