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

Commit a8f9f117 authored by changho.shin's avatar changho.shin Committed by Changho Shin
Browse files

Include system_other.img in super.img by default 

Currently, only dist build makes super.img with system_other.
Let build system include system_other in super image by default.

Test: m -j & check built super.img
Bug: 142669000

Change-Id: I00a8815b30fa6fb8c62e204fdc35e046071bd401
parent ef582f14

core/Makefile

+8 −0
Original line number Original line Diff line number Diff line
@@ -4829,6 +4829,8 @@ define build-superimage-target 
  $(call dump-super-image-info,$(2))

  $(call dump-super-image-info,$(2))

  $(foreach p,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \

  $(foreach p,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \

    echo "$(p)_image=$(INSTALLED_$(call to-upper,$(p))IMAGE_TARGET)" >> $(2);)

    echo "$(p)_image=$(INSTALLED_$(call to-upper,$(p))IMAGE_TARGET)" >> $(2);)

  $(if $(BUILDING_SYSTEM_OTHER_IMAGE), $(if $(filter system,$(BOARD_SUPER_PARTITION_PARTITION_LIST)), \

    echo "system_other_image=$(INSTALLED_SYSTEMOTHERIMAGE_TARGET)" >> $(2);))

  mkdir -p $(dir $(1))

  mkdir -p $(dir $(1))

  PATH=$(dir $(LPMAKE)):$$PATH \

  PATH=$(dir $(LPMAKE)):$$PATH \

    $(BUILD_SUPER_IMAGE) -v $(2) $(1)

    $(BUILD_SUPER_IMAGE) -v $(2) $(1)
@@ -4838,6 +4840,12 @@ INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img 
INSTALLED_SUPERIMAGE_DEPENDENCIES := $(LPMAKE) $(BUILD_SUPER_IMAGE) \

INSTALLED_SUPERIMAGE_DEPENDENCIES := $(LPMAKE) $(BUILD_SUPER_IMAGE) \

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

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





ifdef BUILDING_SYSTEM_OTHER_IMAGE

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

INSTALLED_SUPERIMAGE_DEPENDENCIES += $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)

endif

endif



# If BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is set, super.img is built from images in the

# If BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT is set, super.img is built from images in the

# $(PRODUCT_OUT) directory, and is built to $(PRODUCT_OUT)/super.img. Also, it will

# $(PRODUCT_OUT) directory, and is built to $(PRODUCT_OUT)/super.img. Also, it will

# be built for non-dist builds. This is useful for devices that uses super.img directly, e.g.

# be built for non-dist builds. This is useful for devices that uses super.img directly, e.g.