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

Merge "Fix str/bytes type error in ReplaceOtaKeys" into main am: f54075d5d4 am: baeab42b59

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

Change-Id: I6320df87dc49791850eccc3cd61d6b39e8978e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-05 17:40:43 +00:00
committed by Automerger Merge Worker
parent 82012fa917 baeab42b59
commit 0f6cb74446
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/sign_target_files_apks.py
View File

@@ -1131,9 +1131,9 @@ def WriteOtacerts(output_zip, filename, keys):
common.ZipWriteStr(output_zip, filename, temp_file.getvalue())
def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
def ReplaceOtaKeys(input_tf_zip: zipfile.ZipFile, output_tf_zip, misc_info):
try:
keylist = input_tf_zip.read("META/otakeys.txt").split()
keylist = input_tf_zip.read("META/otakeys.txt").decode().split()
except KeyError:
raise common.ExternalError("can't read META/otakeys.txt from input")