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

Commit 70bf4aa3 authored by Gabriele M's avatar Gabriele M Committed by Rashed Abdel-Tawab
Browse files

releasetools: Generate recovery-from-boot.p with bsdiff if necessary 

If TARGET_NOT_USE_GZIP_RECOVERY_RAMDISK is true, we want to use bsdiff
to create recovery-from-boot.p, otherwise there are high chances that
imgdiff will fail. Currently this is done only when running make, but
not when we re-create the patch from releasetools, so do it.

Also, since recovery-resource.dat is used as bonus data for imgdiff,
don't build it if we are going to use bsdiff.

Change-Id: I93a662a358ee79f56b8acd4329eedd166a176c66
(cherry picked from commit 543d7376)
parent 5e44473f

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ endif 
#   b) We build a single image that contains boot and recovery both

#      (BOARD_USES_RECOVERY_AS_BOOT = true).



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

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

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

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

else
@@ -2510,6 +2510,9 @@ endif 
ifeq ($(BOARD_USES_FULL_RECOVERY_IMAGE),true)

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

endif

ifeq ($(TARGET_NOT_USE_GZIP_RECOVERY_RAMDISK),true)

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

endif

ifeq ($(BOARD_AVB_ENABLE),true)

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

	$(hide) echo "avb_vbmeta_key_path=$(BOARD_AVB_KEY_PATH)" >> $(zip_root)/META/misc_info.txt

tools/releasetools/common.py

+6 −2
Original line number Diff line number Diff line
@@ -1624,14 +1624,18 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img, 


  full_recovery_image = info_dict.get("full_recovery_image", None) == "true"

  system_root_image = info_dict.get("system_root_image", None) == "true"

  use_bsdiff = info_dict.get("no_gzip_recovery_ramdisk", None) == "true"



  if full_recovery_image:

    output_sink("etc/recovery.img", recovery_img.data)



  else:

    if use_bsdiff:

      diff_program = ["bsdiff"]

    else:

      diff_program = ["imgdiff"]

    path = os.path.join(input_dir, "SYSTEM", "etc", "recovery-resource.dat")

    if os.path.exists(path):

    if os.path.exists(path) and not use_bsdiff:

      diff_program.append("-b")

      diff_program.append(path)

      bonus_args = "-b /system/etc/recovery-resource.dat"