diff options
| author | Roman Kiryanov <rkir@google.com> | 2019-02-15 16:12:21 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-15 16:12:21 -0800 |
| commit | 27a67bac5ce0a5785d2c6bd92cc4a8e8ab1fbfa6 (patch) | |
| tree | 99fc09c0d9a174d9b4d759a9637b841e762c8292 | |
| parent | b133ed8e18d9a7dd6cbfa8c9dfb906312b750629 (diff) | |
| parent | 7848e3cfef412e3dc53b3588a63faf28381b8de7 (diff) | |
| download | build-27a67bac5ce0a5785d2c6bd92cc4a8e8ab1fbfa6.tar.gz | |
Merge "Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE"
am: 7848e3cfef
Change-Id: Icf2c7e630bd5009b78015ef6aa275e7c199cd5eb
| -rw-r--r-- | core/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 1846a8802e..ead675454e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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) |