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

Commit 7e678023 authored by Matt Wachowski's avatar Matt Wachowski Committed by Gerrit Code Review
Browse files

Merge "Added rules to include verified boot config in zip"

parents 15a7ea13 9e4d5153

core/Makefile

+13 −0
Original line number Diff line number Diff line
@@ -3887,6 +3887,18 @@ $(INSTALLED_QEMU_ODMIMAGE): $(INSTALLED_ODMIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(S 
odmimage: $(INSTALLED_QEMU_ODMIMAGE)

droidcore: $(INSTALLED_QEMU_ODMIMAGE)

endif



ifeq ($(BOARD_AVB_ENABLE),true)

QEMU_VERIFIED_BOOT_PARAMS := $(PRODUCT_OUT)/VerifiedBootParams.textproto

MK_VERIFIED_BOOT_KERNEL_CMDLINE_SH := device/generic/goldfish/tools/mk_verified_boot_params.sh

$(QEMU_VERIFIED_BOOT_PARAMS): $(INSTALLED_QEMU_SYSTEMIMAGE) $(MK_VERIFIED_BOOT_KERNEL_CMDLINE_SH) $(INSTALLED_VBMETAIMAGE_TARGET) $(SGDISK_HOST) $(AVBTOOL)

	@echo Creating $@

	(export SGDISK=$(SGDISK_HOST) AVBTOOL=$(AVBTOOL); $(MK_VERIFIED_BOOT_KERNEL_CMDLINE_SH) $(INSTALLED_SYSTEMIMAGE_TARGET) $(INSTALLED_QEMU_SYSTEMIMAGE) $(QEMU_VERIFIED_BOOT_PARAMS))





systemimage: $(QEMU_VERIFIED_BOOT_PARAMS)

droidcore: $(QEMU_VERIFIED_BOOT_PARAMS)

endif

endif

# -----------------------------------------------------------------

# The emulator package
@@ -3987,6 +3999,7 @@ deps := \ 
	$(INSTALLED_SYSTEMIMAGE_TARGET) \

	$(INSTALLED_QEMU_SYSTEMIMAGE) \

	$(INSTALLED_QEMU_VENDORIMAGE) \

	$(QEMU_VERIFIED_BOOT_PARAMS) \

	$(INSTALLED_USERDATAIMAGE_TARGET) \

	$(INSTALLED_RAMDISK_TARGET) \

	$(INSTALLED_SDK_BUILD_PROP_TARGET) \

core/tasks/sdk-addon.mk

+6 −0
Original line number Diff line number Diff line
@@ -71,6 +71,12 @@ files_to_copy += \ 
	$(addon_dir_img):$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt \

	$(addon_dir_img):$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP):images/source.properties





ifeq ($(BOARD_AVB_ENABLE),true)

files_to_copy += \

	$(addon_dir_img):$(QEMU_VERIFIED_BOOT_PARAMS):images/$(TARGET_CPU_ABI)/VerifiedBootParams.textproto

endif



# Generate rules to copy the requested files

$(foreach cf,$(files_to_copy), \

  $(eval _root := $(call word-colon,1,$(cf))) \