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

Merge "Silence superfluous build messages."

Browse Source 
am: 4dbdb60698

Change-Id: I3574184c22b8fca41fd85e09ceacc2b598643c67
This commit is contained in:
Tomasz Wasilczyk
2017-11-15 22:35:48 +00:00
committed by android-build-merger
parent fe590192de 4dbdb60698
commit a62800487e
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/generate-notice-files.py
View File

@@ -253,15 +253,12 @@ def main(argv):
filesets = [sorted(files_with_same_hash[md5]) for md5 in sorted(files_with_same_hash.keys())]
print "Combining NOTICE files into text"
combine_notice_files_text(filesets, input_dir, txt_output_file, file_title)
if html_output_file is not None:
print "Combining NOTICE files into HTML"
combine_notice_files_html(filesets, input_dir, html_output_file)
if xml_output_file is not None:
print "Combining NOTICE files into XML"
combine_notice_files_xml(files_with_same_hash, input_dir, xml_output_file)
if __name__ == "__main__":

11
tools/releasetools/build_image.py
View File

@@ -195,8 +195,9 @@ def AdjustPartitionSizeForVerity(partition_size, fec_supported):
else:
hi = i
print("Adjusted partition size for verity, partition_size: {},"
" verity_size: {}".format(result, verity_size))
if OPTIONS.verbose:
print("Adjusted partition size for verity, partition_size: {},"
" verity_size: {}".format(result, verity_size))
AdjustPartitionSizeForVerity.results[key] = (result, verity_size)
return (result, verity_size)
@@ -257,7 +258,7 @@ def Append2Simg(sparse_image_path, unsparse_image_path, error_message):
return True
def Append(target, file_to_append, error_message):
print "appending %s to %s" % (file_to_append, target)
# appending file_to_append to target
with open(target, "a") as out_file:
with open(file_to_append, "r") as input_file:
for line in input_file:
@@ -535,9 +536,9 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
try:
if fs_type.startswith("ext4"):
(ext4fs_output, exit_code) = RunCommand(build_command, True)
(ext4fs_output, exit_code) = RunCommand(build_command)
else:
(_, exit_code) = RunCommand(build_command, True)
(_, exit_code) = RunCommand(build_command)
finally:
if in_dir != origin_in:
# Clean up temporary directories and files.