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

Merge "Remove the backwards compatibility support for misc_info.txt." am: 042d5a846f 

am: ba765d7c47

Change-Id: Ibfefb981ccc25a28525e0c9569270c50b15a52a6
This commit is contained in:
Tao Bao 2017-02-28 18:13:18 +00:00 committed by android-build-merger
parent ab93845a78 ba765d7c47
commit 1f4831830e
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/releasetools/common.py
View File

@ -146,30 +146,13 @@ def LoadInfoDict(input_file, input_dir=None):
except IOError as e: except IOError as e:
if e.errno == errno.ENOENT: if e.errno == errno.ENOENT:
raise KeyError(fn) raise KeyError(fn)
d = {}
try: try:
d = LoadDictionaryFromLines(read_helper("META/misc_info.txt").split("\n")) d = LoadDictionaryFromLines(read_helper("META/misc_info.txt").split("\n"))
except KeyError: except KeyError:
# ok if misc_info.txt doesn't exist raise ValueError("can't find META/misc_info.txt in input target-files")
pass
# backwards compatibility: These values used to be in their own assert "recovery_api_version" in d
# files. Look for them, in case we're processing an old
# target_files zip.
if "recovery_api_version" not in d:
try:
d["recovery_api_version"] = read_helper(
"META/recovery-api-version.txt").strip()
except KeyError:
raise ValueError("can't find recovery API version in input target-files")
if "tool_extensions" not in d:
try:
d["tool_extensions"] = read_helper("META/tool-extensions.txt").strip()
except KeyError:
# ok if extensions don't exist
pass
if "fstab_version" not in d: if "fstab_version" not in d:
d["fstab_version"] = "1" d["fstab_version"] = "1"