From 40afa81053373d7b011df7dc95df02edcc2193ec Mon Sep 17 00:00:00 2001 From: Matt Wachowski Date: Thu, 27 Sep 2018 12:49:18 -0700 Subject: [PATCH] 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 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index dabb86da22..f7f6f3500d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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)