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

Commit 32c76fe2 authored by Anton Hansson's avatar Anton Hansson
Browse files

Fix qemu image definition conditionals 

BOARD_USES_<X>IMAGE is not equivalent with that image actually
existing. Since these targets depend on the INSTALLED_<X>IMAGE
variables being defined, gate the conditionals on that instead.

This logic is used in other places in Makefile

Bug: 120974093
Test: make
Change-Id: I6766042c801bf7fddc4b84671dbe5d3a157aea6b
parent 93e6c597

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4091,7 +4091,7 @@ $(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_SYSTEMIMAGE_TARGET) $(MK_QEMU_IMAGE_S 


systemimage: $(INSTALLED_QEMU_SYSTEMIMAGE)

droidcore: $(INSTALLED_QEMU_SYSTEMIMAGE)

ifeq ($(BOARD_USES_VENDORIMAGE),true)

ifdef INSTALLED_VENDORIMAGE_TARGET

INSTALLED_QEMU_VENDORIMAGE := $(PRODUCT_OUT)/vendor-qemu.img

$(INSTALLED_QEMU_VENDORIMAGE): $(INSTALLED_VENDORIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create vendor-qemu.img
@@ -4100,7 +4100,7 @@ $(INSTALLED_QEMU_VENDORIMAGE): $(INSTALLED_VENDORIMAGE_TARGET) $(MK_QEMU_IMAGE_S 
vendorimage: $(INSTALLED_QEMU_VENDORIMAGE)

droidcore: $(INSTALLED_QEMU_VENDORIMAGE)

endif

ifeq ($(BOARD_USES_PRODUCTIMAGE),true)

ifdef INSTALLED_PRODUCTIMAGE_TARGET

INSTALLED_QEMU_PRODUCTIMAGE := $(PRODUCT_OUT)/product-qemu.img

$(INSTALLED_QEMU_PRODUCTIMAGE): $(INSTALLED_PRODUCTIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create product-qemu.img
@@ -4109,7 +4109,7 @@ $(INSTALLED_QEMU_PRODUCTIMAGE): $(INSTALLED_PRODUCTIMAGE_TARGET) $(MK_QEMU_IMAGE 
productimage: $(INSTALLED_QEMU_PRODUCTIMAGE)

droidcore: $(INSTALLED_QEMU_PRODUCTIMAGE)

endif

ifeq ($(BOARD_USES_PRODUCT_SERVICESIMAGE),true)

ifdef INSTALLED_PRODUCT_SERVICESIMAGE_TARGET

INSTALLED_QEMU_PRODUCT_SERVICESIMAGE := $(PRODUCT_OUT)/product_services-qemu.img

$(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE): $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create product_services-qemu.img
@@ -4118,7 +4118,7 @@ $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE): $(INSTALLED_PRODUCT_SERVICESIMAGE_TARGE 
productservicesimage: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE)

droidcore: $(INSTALLED_QEMU_PRODUCT_SERVICESIMAGE)

endif

ifeq ($(BOARD_USES_ODMIMAGE),true)

ifdef INSTALLED_ODMIMAGE_TARGET

INSTALLED_QEMU_ODMIMAGE := $(PRODUCT_OUT)/odm-qemu.img

$(INSTALLED_QEMU_ODMIMAGE): $(INSTALLED_ODMIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST)

	@echo Create odm-qemu.img