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

Commit 4f62aa08 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Fix images-for-partitions() for 'init_boot' 

Macro images-for-partitions() returns $(INSTALLED_INIT_BOOTIMAGE_TARGET)
for the 'init_boot' partition, which is empty. It should return
$(INSTALLED_INIT_BOOT_IMAGE_TARGET) instead.

Bug: 203698939
Test: `make` without chaining 'init_boot' partition
Change-Id: I387813283dfad7e1b2f762a5fa4065775977caf7
parent 8c861cec

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -3546,7 +3546,10 @@ endif # BOARD_USES_PVMFWIMAGE 
# $(INSTALLED_VENDORIMAGE_TARGET)" for "system vendor".

# (1): list of partitions like "system", "vendor" or "system product system_ext".

define images-for-partitions

$(strip $(foreach item,$(1),$(if $(filter $(item),system_other),$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),$(INSTALLED_$(call to-upper,$(item))IMAGE_TARGET))))

$(strip $(foreach item,$(1),\

  $(if $(filter $(item),system_other),$(INSTALLED_SYSTEMOTHERIMAGE_TARGET),\

    $(if $(filter $(item),init_boot),$(INSTALLED_INIT_BOOT_IMAGE_TARGET),\

      $(INSTALLED_$(call to-upper,$(item))IMAGE_TARGET)))))

endef



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