tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" am: 955ee3712d am: 2e44a5303c am: 40e9d87fdf am: 68e1e13857

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

Change-Id: I5209aadac8bc3e85b8e1a7be20f7fe554237a79f
This commit is contained in:
Treehugger Robot 2022-02-10 00:33:32 +00:00 committed by Automerger Merge Worker
commit 4cb64a50b6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/releasetools/add_img_to_target_files.py
View file

@ -170,16 +170,16 @@ def AddVendor(output_zip, recovery_img=None, boot_img=None):
return img.name return img.name
def output_sink(fn, data): def output_sink(fn, data):
ofile = open(os.path.join(OPTIONS.input_tmp, "VENDOR", fn), "w") output_file = os.path.join(OPTIONS.input_tmp, "VENDOR", fn)
with open(output_file, "wb") as ofile:
ofile.write(data) ofile.write(data)
ofile.close()
if output_zip: if output_zip:
arc_name = "VENDOR/" + fn arc_name = "VENDOR/" + fn
if arc_name in output_zip.namelist(): if arc_name in output_zip.namelist():
OPTIONS.replace_updated_files_list.append(arc_name) OPTIONS.replace_updated_files_list.append(arc_name)
else: else:
common.ZipWrite(output_zip, ofile.name, arc_name) common.ZipWrite(output_zip, output_file, arc_name)
board_uses_vendorimage = OPTIONS.info_dict.get( board_uses_vendorimage = OPTIONS.info_dict.get(
"board_uses_vendorimage") == "true" "board_uses_vendorimage") == "true"