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

Commit 448dccbc authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Fix the bug with TARGET_NO_RECOVERY. 

The packaging script is broken when we set TARGET_NO_RECOVERY and
SYSTEM_ROOT_IMAGE both. With TARGET_NO_RECOVERY set, we don't have
RECOVERY/RAMDISK/etc/recovery.fstab. It thus fails the assertion that
"/" must exist in fstab when enabling SYSTEM_ROOT_IMAGE.

Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
(cherry picked from commit 48550cce)
parent cb219828

tools/releasetools/common.py

+5 −2
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ def LoadInfoDict(input_file, input_dir=None): 
  makeint("boot_size")

  makeint("fstab_version")



  if d.get("no_recovery", False) == "true":

    d["fstab"] = None

  else:

    d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"],

                                   d.get("system_root_image", False))

  d["build.prop"] = LoadBuildProp(read_helper)