openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." am: 4ed5735a68 am: 733ba8f0e4 

am: 842e858f0c

* commit '842e858f0c235ff7a95091e1d7963ab0947d5573':
  releasetools: Fix the bug with TARGET_NO_RECOVERY.
This commit is contained in:
Tao Bao 2015-11-20 04:56:46 +00:00 committed by android-build-merger
parent ed97097f9d 842e858f0c
commit 956e119b13
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/common.py
View File

@ -211,8 +211,11 @@ def LoadInfoDict(input_file, input_dir=None):
makeint("boot_size")
makeint("fstab_version")
d["fstab"] = LoadRecoveryFSTab(read_helper, d["fstab_version"],
d.get("system_root_image", False))
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)
return d