StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "make/core/Makefile: Skip images for local builds by default." into main am: f38c15ab8e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3211136

Change-Id: Ic6d952283a654d9de5c380dbf670e62f4bf242f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-20 17:05:39 +00:00
committed by Automerger Merge Worker
parent 4a876883ff f38c15ab8e
commit 0117ccddad
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/Makefile
View File

@@ -7914,10 +7914,11 @@ PACKED_IMAGE_ARCHIVE_TARGET := $(PACK_IMAGE_TARGET).gz
$(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).gz
$(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
# -----------------------------------------------------------------