p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Look for recovery.fstab at both locations."

This commit is contained in:
Tao Bao 2018-08-23 06:05:40 +00:00 committed by Gerrit Code Review
parent da9f2d8fd4 b4adc06732
commit ebe17177fe
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/releasetools/common.py
View File

@ -240,12 +240,28 @@ def LoadInfoDict(input_file, input_dir=None):
system_root_image = d.get("system_root_image") == "true" system_root_image = d.get("system_root_image") == "true"
if d.get("no_recovery") != "true": if d.get("no_recovery") != "true":
recovery_fstab_path = "RECOVERY/RAMDISK/system/etc/recovery.fstab" recovery_fstab_path = "RECOVERY/RAMDISK/system/etc/recovery.fstab"
if isinstance(input_file, zipfile.ZipFile):
if recovery_fstab_path not in input_file.namelist():
recovery_fstab_path = "RECOVERY/RAMDISK/etc/recovery.fstab"
else:
path = os.path.join(input_file, *recovery_fstab_path.split("/"))
if not os.path.exists(path):
recovery_fstab_path = "RECOVERY/RAMDISK/etc/recovery.fstab"
d["fstab"] = LoadRecoveryFSTab( d["fstab"] = LoadRecoveryFSTab(
read_helper, d["fstab_version"], recovery_fstab_path, system_root_image) read_helper, d["fstab_version"], recovery_fstab_path, system_root_image)
elif d.get("recovery_as_boot") == "true": elif d.get("recovery_as_boot") == "true":
recovery_fstab_path = "BOOT/RAMDISK/system/etc/recovery.fstab" recovery_fstab_path = "BOOT/RAMDISK/system/etc/recovery.fstab"
if isinstance(input_file, zipfile.ZipFile):
if recovery_fstab_path not in input_file.namelist():
recovery_fstab_path = "BOOT/RAMDISK/etc/recovery.fstab"
else:
path = os.path.join(input_file, *recovery_fstab_path.split("/"))
if not os.path.exists(path):
recovery_fstab_path = "BOOT/RAMDISK/etc/recovery.fstab"
d["fstab"] = LoadRecoveryFSTab( d["fstab"] = LoadRecoveryFSTab(
read_helper, d["fstab_version"], recovery_fstab_path, system_root_image) read_helper, d["fstab_version"], recovery_fstab_path, system_root_image)
else: else:
d["fstab"] = None d["fstab"] = None