Merge "Simplify codes for BuildSuperImage func" am: c02be15729
am: f199d2d52f
Original change: https://android-review.googlesource.com/c/platform/build/+/1685175 Change-Id: I746156252174442dbaa708b1e150ce5f2f453970
This commit is contained in:
@@ -194,10 +194,8 @@ def BuildSuperImage(inp, out):
|
||||
return BuildSuperImageFromTargetFiles(inp, out)
|
||||
|
||||
if os.path.isfile(inp):
|
||||
with open(inp) as f:
|
||||
lines = f.read()
|
||||
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))
|
||||
|
||||
|
Reference in New Issue
Block a user