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

Commit 8899c7ce authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Include system_other.img in super.img by default" am: 0fdd73b1 

am: dd8414a5

Change-Id: Ie202169775e3bcc96846c3e7ee0173bbb2076f91
parents 0ba1b3f2 dd8414a5

core/Makefile

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

  $(foreach p,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \

    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))

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

    $(BUILD_SUPER_IMAGE) -v $(2) $(1)
@@ -4824,6 +4826,12 @@ 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))



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

# $(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.