make/core/Makefile: Skip images for local builds by default.
Packing and archiving the image are expensive operations.
Swap the image archive to dist-files for builders, and skip
building the raw image locally unless it's specifically
requested via the new PHONY targets.
Bug: None
Test: m, m dist, m pack-image
Change-Id: I2a3f1ebea689c23da88ca6d0757b827b7eb0c936
diff --git a/core/Makefile b/core/Makefile
index 70798a9..18ee77d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -7914,10 +7914,11 @@
$(PACKED_IMAGE_ARCHIVE_TARGET): $(PACK_IMAGE_TARGET) | $(GZIP)
$(GZIP) -fk $(PACK_IMAGE_TARGET)
-droidcore-unbundled: $(PACKED_IMAGE_ARCHIVE_TARGET)
-
$(call dist-for-goals,dist_files,$(PACKED_IMAGE_ARCHIVE_TARGET))
+.PHONY: pack-image
+pack-image: $(PACK_IMAGE_TARGET)
+
endif # PACK_DESKTOP_FILESYSTEM_IMAGES
# -----------------------------------------------------------------
@@ -7933,10 +7934,11 @@
$(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET): $(PACK_RECOVERY_IMAGE_TARGET) | $(GZIP)
$(GZIP) -fk $(PACK_RECOVERY_IMAGE_TARGET)
-droidcore-unbundled: $(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET)
-
$(call dist-for-goals,dist_files,$(PACKED_RECOVERY_IMAGE_ARCHIVE_TARGET))
+.PHONY: pack-recovery-image
+pack-recovery-image: $(PACK_RECOVERY_IMAGE_TARGET)
+
endif # PACK_DESKTOP_RECOVERY_IMAGE
# -----------------------------------------------------------------