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

Commit 27a67bac authored by Roman Kiryanov's avatar Roman Kiryanov Committed by android-build-merger
Browse files

Merge "Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE" 

am: 7848e3cf

Change-Id: Icf2c7e630bd5009b78015ef6aa275e7c199cd5eb
parents b133ed8e 7848e3cf

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -4312,15 +4312,18 @@ endif # PRODUCT_BUILD_SUPER_PARTITION == "true" 
dalvikfiles: $(INTERNAL_DALVIK_MODULES)



ifeq ($(BUILD_QEMU_IMAGES),true)

INSTALLED_QEMU_SYSTEMIMAGE := $(PRODUCT_OUT)/system-qemu.img

MK_QEMU_IMAGE_SH := device/generic/goldfish/tools/mk_qemu_image.sh

SGDISK_HOST := $(HOST_OUT_EXECUTABLES)/sgdisk



ifdef INSTALLED_SYSTEMIMAGE_TARGET

INSTALLED_QEMU_SYSTEMIMAGE := $(PRODUCT_OUT)/system-qemu.img

$(INSTALLED_QEMU_SYSTEMIMAGE): $(INSTALLED_SYSTEMIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)

	@echo Create system-qemu.img

	(export SGDISK=$(SGDISK_HOST) SIMG2IMG=$(SIMG2IMG); $(MK_QEMU_IMAGE_SH) ${PRODUCT_OUT}/system.img)



systemimage: $(INSTALLED_QEMU_SYSTEMIMAGE)

droidcore: $(INSTALLED_QEMU_SYSTEMIMAGE)

endif

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)