Makefile: Use (again) pre-built crosvm.ext4
Use the provided pre-built crosvm.ext4 if the user has not supplied a
CROSVM_TAR_GZ. This avoids the need for triggering a re-build of the
image from an archive as that would rely on a mkfs flag not supported by
some build servers.
Change-Id: Iab0c0272e03c99606b6d7f741c1f7a670363c096
diff --git a/Makefile b/Makefile
index 47bdee5..4e3bd66 100644
--- a/Makefile
+++ b/Makefile
@@ -310,16 +310,17 @@
## Generating/Updating prebuilts
##
-PREBUILTS_CROSVM_TAR_GZ := prebuilts/linux-aarch64/cvd-host_package.tar.gz
+PREBUILTS_CROSVM_EXT4 := prebuilts/linux-aarch64/images/crosvm.ext4
PREBUILTS_ROOTFS_EXT4 := prebuilts/linux-aarch64/images/rootfs.ext4
PREBUILTS_QEMU_ROM := prebuilts/linux-aarch64/images/efi-virtio.rom
PREBUILTS_QEMU_BIN := prebuilts/linux-x86/qemu
+CUSTOM_CROSVM_EXT4 := $(OUT_DIR)/images/crosvm.ext4
+
ifeq ($(CROSVM_TAR_GZ),)
-CROSVM_TAR_GZ := $(PREBUILTS_CROSVM_TAR_GZ)
-CROSVM_EXT4 := $(OUT_DIR)/images/prebuilt-crosvm.ext4
+CROSVM_EXT4 := $(PREBUILTS_CROSVM_EXT4)
else
-CROSVM_EXT4 := $(OUT_DIR)/images/crosvm.ext4
+CROSVM_EXT4 := $(CUSTOM_CROSVM_EXT4)
endif
.PHONY:update-prebuilts
@@ -350,8 +351,8 @@
CROSVM_IMG_SIZE_MB := 1024
-$(CROSVM_EXT4): TMP_DIR := $(shell mktemp -d)
-$(CROSVM_EXT4): $(CROSVM_TAR_GZ)
+$(CUSTOM_CROSVM_EXT4): TMP_DIR := $(shell mktemp -d)
+$(CUSTOM_CROSVM_EXT4): $(CROSVM_TAR_GZ)
mkdir -p $(@D)
cd $(TMP_DIR) && tar xzvf $(abspath $<)
dd if=/dev/zero of=$@.tmp bs=1M count=$(CROSVM_IMG_SIZE_MB)
