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

Commit 752439b3 authored by Chen, ZhiminX's avatar Chen, ZhiminX Committed by Xihua Chen
Browse files

Add recovery_acpio option to make recovery image 

Test: can generate recovery image with recovery_acpio
Fixes: 111871613

Change-Id: I9174a4741f571a00bcadc548cd9e1316b4175132
parent 19e65028

core/Makefile

+21 −2
Original line number Diff line number Diff line
@@ -1637,9 +1637,12 @@ endif 
#   d) We include the recovery DTBO image within recovery - not needing the resource file as we

#      do bsdiff because boot and recovery will contain different number of entries

#      (BOARD_INCLUDE_RECOVERY_DTBO = true).

#   e) We include the recovery ACPIO image within recovery - not needing the resource file as we

#      do bsdiff because boot and recovery will contain different number of entries

#      (BOARD_INCLUDE_RECOVERY_ACPIO = true).



ifeq (,$(filter true, $(BOARD_USES_FULL_RECOVERY_IMAGE) $(BOARD_USES_RECOVERY_AS_BOOT) \

  $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO)))

  $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO)))

# Named '.dat' so we don't attempt to use imgdiff for patching it.

RECOVERY_RESOURCE_ZIP := $(TARGET_OUT)/etc/recovery-resource.dat

else
@@ -1713,6 +1716,9 @@ endif 
ifdef BOARD_INCLUDE_RECOVERY_DTBO

  INTERNAL_RECOVERYIMAGE_ARGS += --recovery_dtbo $(BOARD_PREBUILT_DTBOIMAGE)

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

  INTERNAL_RECOVERYIMAGE_ARGS += --recovery_acpio $(BOARD_RECOVERY_ACPIO)

endif



# Keys authorized to sign OTA packages this build will accept.  The

# build always uses dev-keys for this; release packaging tools will
@@ -1799,6 +1805,9 @@ endif 
ifdef BOARD_INCLUDE_RECOVERY_DTBO

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO)

endif



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

	    $(INTERNAL_ROOT_FILES) \
@@ -1819,6 +1828,9 @@ endif # BOARD_USES_RECOVERY_AS_BOOT 
ifdef BOARD_INCLUDE_RECOVERY_DTBO

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO)

endif



$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \

	    $(INTERNAL_ROOT_FILES) \
@@ -2029,7 +2041,7 @@ INSTALLED_SYSTEMIMAGE := $(INSTALLED_SYSTEMIMAGE_TARGET) 
ifneq ($(INSTALLED_BOOTIMAGE_TARGET),)

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

ifneq ($(BOARD_USES_FULL_RECOVERY_IMAGE),true)

ifneq (,$(filter true, $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO)))

ifneq (,$(filter true, $(BOARD_BUILD_SYSTEM_ROOT_IMAGE) $(BOARD_INCLUDE_RECOVERY_DTBO) $(BOARD_INCLUDE_RECOVERY_ACPIO)))

diff_tool := $(HOST_OUT_EXECUTABLES)/bsdiff

else

diff_tool := $(HOST_OUT_EXECUTABLES)/imgdiff
@@ -3385,6 +3397,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \

	    $(BOARD_PREBUILT_DTBOIMAGE) \

	    $(BOARD_RECOVERY_ACPIO) \

	    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_BASE_FS_PATH) \

	    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH) \

	    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PRODUCT_BASE_FS_PATH) \
@@ -3425,6 +3438,9 @@ endif 
ifdef BOARD_INCLUDE_RECOVERY_DTBO

	$(hide) cp $(BOARD_PREBUILT_DTBOIMAGE) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_dtbo

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

	$(hide) cp $(BOARD_RECOVERY_ACPIO) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/recovery_acpio

endif

ifdef INTERNAL_KERNEL_CMDLINE

	$(hide) echo "$(INTERNAL_KERNEL_CMDLINE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/cmdline

endif
@@ -3528,6 +3544,9 @@ endif 
ifdef BOARD_INCLUDE_RECOVERY_DTBO

	$(hide) echo "include_recovery_dtbo=true" >> $(zip_root)/META/misc_info.txt

endif

ifdef BOARD_INCLUDE_RECOVERY_ACPIO

	$(hide) echo "include_recovery_acpio=true" >> $(zip_root)/META/misc_info.txt

endif

ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE

	$(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt

endif

tools/releasetools/common.py

+7 −4
Original line number Diff line number Diff line
@@ -623,10 +623,13 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None, 
  # "boot" or "recovery", without extension.

  partition_name = os.path.basename(sourcedir).lower()



  if (partition_name == "recovery" and

      info_dict.get("include_recovery_dtbo") == "true"):

  if partition_name == "recovery":

    if info_dict.get("include_recovery_dtbo") == "true":

      fn = os.path.join(sourcedir, "recovery_dtbo")

      cmd.extend(["--recovery_dtbo", fn])

    if info_dict.get("include_recovery_acpio") == "true":

      fn = os.path.join(sourcedir, "recovery_acpio")

      cmd.extend(["--recovery_acpio", fn])



  RunAndCheckOutput(cmd)