StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: Fix the bug with TARGET_NO_RECOVERY.

Browse Source 
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 in
common.LoadRecoveryFSTab() that "/" must exist in fstab when enabling
SYSTEM_ROOT_IMAGE.

Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
This commit is contained in:
Tao Bao
2015-11-19 17:05:46 -08:00
parent b2055df782
commit 48550cceb0
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/common.py
View File

@@ -211,6 +211,9 @@ def LoadInfoDict(input_file, input_dir=None):
makeint("boot_size") makeint("boot_size")
makeint("fstab_version") makeint("fstab_version")
if d.get("no_recovery", False) == "true":
d["fstab"] = None
else:
d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"], d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"],
d.get("system_root_image", False)) d.get("system_root_image", False))
d["build.prop"] = LoadBuildProp(read_helper) d["build.prop"] = LoadBuildProp(read_helper)