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

Commit 37b96ef2 authored by Tao Bao's avatar Tao Bao Committed by Rom Lemarchand
Browse files

Honor TARGET_NO_RECOVERY flag. 

Don't generate recovery.img when calling 'make dist' if
TARGET_NO_RECOVERY is set. The build system passes the flag to the
packaging script which then generates recovery.img conditionally.

Bug: 25329471
Change-Id: Ia7f08943834ee39e781d7e9b5beb1b31d95a73d9
(cherry picked from commit db45efa6)
parent 116977c7

core/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	@echo "Package target files: $@"

	$(hide) rm -rf $@ $(zip_root)

	$(hide) mkdir -p $(dir $@) $(zip_root)

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

	@# Components of the recovery image

	$(hide) mkdir -p $(zip_root)/RECOVERY

	$(hide) $(call package_files-copy-root, \
@@ -1436,6 +1437,7 @@ ifdef BOARD_KERNEL_BASE 
endif

ifdef BOARD_KERNEL_PAGESIZE

	$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/RECOVERY/pagesize

endif

endif

	@# Components of the boot image

	$(hide) mkdir -p $(zip_root)/BOOT
@@ -1489,6 +1491,9 @@ endif 
ifdef BOARD_BOOTIMAGE_PARTITION_SIZE

	$(hide) echo "boot_size=$(BOARD_BOOTIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt

endif

ifeq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

	$(hide) echo "no_recovery=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
@@ -1527,7 +1532,9 @@ endif 
	$(hide) zipinfo -1 $@ | awk 'BEGIN { FS="SYSTEM/" } /^SYSTEM\// {print "system/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -D $(TARGET_OUT) -S $(SELINUX_FC) > $(zip_root)/META/filesystem_config.txt

	$(hide) zipinfo -1 $@ | awk 'BEGIN { FS="VENDOR/" } /^VENDOR\// {print "vendor/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -D $(TARGET_OUT) -S $(SELINUX_FC) > $(zip_root)/META/vendor_filesystem_config.txt

	$(hide) zipinfo -1 $@ | awk 'BEGIN { FS="BOOT/RAMDISK/" } /^BOOT\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -D $(TARGET_OUT) -S $(SELINUX_FC) > $(zip_root)/META/boot_filesystem_config.txt

ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)

	$(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -D $(TARGET_OUT) -S $(SELINUX_FC) > $(zip_root)/META/recovery_filesystem_config.txt

endif

	$(hide) (cd $(zip_root) && zip -q ../$(notdir $@) META/*filesystem_config.txt)

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	    ./build/tools/releasetools/add_img_to_target_files -p $(HOST_OUT) $@

tools/releasetools/add_img_to_target_files.py

+14 −10
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ def AddImagesToTargetFiles(filename): 
  output_zip = zipfile.ZipFile(filename, "a",

                               compression=zipfile.ZIP_DEFLATED)



  has_recovery = (OPTIONS.info_dict.get("no_recovery") != "true")



  def banner(s):

    print "\n\n++++ " + s + " ++++\n\n"
@@ -291,14 +293,16 @@ def AddImagesToTargetFiles(filename): 
    if boot_image:

      boot_image.AddToZip(output_zip)



  banner("recovery")

  recovery_image = None

  if has_recovery:

    banner("recovery")

    prebuilt_path = os.path.join(OPTIONS.input_tmp, "IMAGES", "recovery.img")

    if os.path.exists(prebuilt_path):

      print "recovery.img already exists in IMAGES/, no need to rebuild..."

      if OPTIONS.rebuild_recovery:

        recovery_image = common.GetBootableImage(

          "IMAGES/recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY")

            "IMAGES/recovery.img", "recovery.img", OPTIONS.input_tmp,

            "RECOVERY")

    else:

      recovery_image = common.GetBootableImage(

          "IMAGES/recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY")

tools/releasetools/img_from_target_files.py

+6 −4
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ def main(argv): 
          "boot.img", "boot.img", OPTIONS.input_tmp, "BOOT")

      if boot_image:

        boot_image.AddToZip(output_zip)



      if OPTIONS.info_dict.get("no_recovery") != "true":

        recovery_image = common.GetBootableImage(

            "recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY")

        if recovery_image:

tools/releasetools/ota_from_target_files.py

+4 −0
Original line number Diff line number Diff line
@@ -1620,6 +1620,10 @@ def main(argv): 
  if OPTIONS.device_specific is not None:

    OPTIONS.device_specific = os.path.abspath(OPTIONS.device_specific)



  if OPTIONS.info_dict.get("no_recovery") == "true":

    raise common.ExternalError(

        "--- target build has specified no recovery ---")



  while True:



    if OPTIONS.no_signing: