Merge "Explain why BuildImage failed." am: 9a33b96103 am: 76eb8e10ee

am: 20742517b4

Change-Id: Icee1c13e2dc8980ee697395b51e758c69e4b3cdf
This commit is contained in:
Elliott Hughes 2017-12-08 01:01:26 +00:00 committed by android-build-merger
commit ef40ea28a6
1 changed files with 6 additions and 1 deletions

View File

@ -548,6 +548,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
if base_fs_file is not None:
os.remove(base_fs_file)
if exit_code != 0:
print("Error: '%s' failed with exit code %d" % (build_command, exit_code))
return False
# Bug: 21522719, 22023465
@ -625,7 +626,11 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
os.remove(unsparse_image)
return exit_code == 0
if exit_code != 0:
print("Error: '%s' failed with exit code %d" % (e2fsck_command, exit_code))
return False
return True
def ImagePropFromGlobalDict(glob_dict, mount_point):