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

Commit 40afa810 authored by Matt Wachowski's avatar Matt Wachowski
Browse files

Supporting change for aosp/771168 

Submitting the change above before this one will "work" for now but we
want to pass vbmeta.img instead of system.img for the more robust
solution.

Bug: 78113934
Test: Built on my local machine.  Asserted that VerifiedBootParams.proto
exists.  Asserted that the emulator boots correctly with this file.

Change-Id: Ie91f49a3c7d49fc667e3f12e7e3866c3d9eb1960
parent 63935608

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3945,7 +3945,7 @@ 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))

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





systemimage: $(QEMU_VERIFIED_BOOT_PARAMS)