aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-02-09 23:35:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-02-09 23:35:22 +0000
commit955ee3712dcc871ada1cc1dcd6b0856ae39e76ca (patch)
tree858aaa9ee6667d6682b6eeda5b828e4af988d4f7
parent44adfa7f8c6ddaf93ebeaa7647c91b7b34830cae (diff)
parent756b56125ae2d4b30d056d2ae8d0818ae2f0d656 (diff)
downloadbuild-android-s-v2-beta-3.tar.gz
Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes""android-s-v2-beta-3android-s-qpr3-beta-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r--tools/releasetools/add_img_to_target_files.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 9a9fba148d..7143775333 100644
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -170,16 +170,16 @@ def AddVendor(output_zip, recovery_img=None, boot_img=None):
return img.name
def output_sink(fn, data):
- ofile = open(os.path.join(OPTIONS.input_tmp, "VENDOR", fn), "w")
- ofile.write(data)
- ofile.close()
+ output_file = os.path.join(OPTIONS.input_tmp, "VENDOR", fn)
+ with open(output_file, "wb") as ofile:
+ ofile.write(data)
if output_zip:
arc_name = "VENDOR/" + fn
if arc_name in output_zip.namelist():
OPTIONS.replace_updated_files_list.append(arc_name)
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") == "true"