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

Merge "Simplify codes for BuildSuperImage func" am: c02be15729 am: f199d2d52f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1685175

Change-Id: I746156252174442dbaa708b1e150ce5f2f453970
This commit is contained in:
Treehugger Robot
2021-04-24 03:05:43 +00:00
committed by Automerger Merge Worker
parent 0a1e0a5914 f199d2d52f
commit 9488811f77
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/build_super_image.py
View File

@@ -194,10 +194,8 @@ def BuildSuperImage(inp, out):
return BuildSuperImageFromTargetFiles(inp, out) return BuildSuperImageFromTargetFiles(inp, out)
if os.path.isfile(inp): if os.path.isfile(inp):
with open(inp) as f:
lines = f.read()
logger.info("Building super image from info dict...") logger.info("Building super image from info dict...")
return BuildSuperImageFromDict(common.LoadDictionaryFromLines(lines.split("\n")), out) return BuildSuperImageFromDict(common.LoadDictionaryFromFile(inp), out)
raise ValueError("{} is not a dictionary or a valid path".format(inp)) raise ValueError("{} is not a dictionary or a valid path".format(inp))