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

Commit 90fcf491 authored by Jeffery Miller's avatar Jeffery Miller
Browse files

core/Makefile: Add ESP to pack-image dependencies 

Add the ESP to the dependencies of desktop pack image
for desktop boards setting `PACK_DESKTOP_ESP_IMAGE`.
This avoids having to run m prior to m pack-image for
the product's esp.img.

Bug: 395703174
Test: m pack-image
Flag: EXEMPT desktop only change
Change-Id: I65979ff7b888e85ba5d3788328ef4358ee0c73ed
parent eb6d9433

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -7552,6 +7552,8 @@ INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img 
INSTALLED_SUPERIMAGE_DEPENDENCIES := $(LPMAKE) $(BUILD_SUPER_IMAGE) \

    $(foreach p, $(BOARD_SUPER_PARTITION_PARTITION_LIST), $(INSTALLED_$(call to-upper,$(p))IMAGE_TARGET))



INSTALLED_ESPIMAGE_TARGET := $(PRODUCT_OUT)/esp.img



ifdef BUILDING_SYSTEM_OTHER_IMAGE

ifneq ($(filter system,$(BOARD_SUPER_PARTITION_PARTITION_LIST)),)

INSTALLED_SUPERIMAGE_DEPENDENCIES += $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)
@@ -8025,6 +8027,10 @@ PACK_IMAGE_DEPS := $(PACK_IMAGE_SCRIPT) \ 
	$(INSTALLED_USERDATAIMAGE_TARGET)

UPDATE_PARTITION_SCRIPT := $(HOST_OUT_EXECUTABLES)/update-partition



ifneq (,$(strip $(PACK_DESKTOP_ESP_IMAGE)))

  PACK_IMAGE_DEPS += $(INSTALLED_ESPIMAGE_TARGET)

endif # PACK_DESKTOP_ESP_IMAGE



# -----------------------------------------------------------------

# Desktop generated firmware filesystem.

TARGET_PRODUCT_FW_IMAGE_PACKAGE := prebuilt-$(TARGET_PRODUCT)-firmware-image