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

Merge "Fix the signing error on no-system-image targets" am: 790214a4c9 am: ba922579b1

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

Change-Id: I74abbf8b433aa0db2cc7d9bfde0ba59386e8a0aa
This commit is contained in:
Treehugger Robot
2022-01-06 06:57:55 +00:00
committed by Automerger Merge Worker
parent a0e28118af ba922579b1
commit 2a00929dec
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/sign_target_files_apks.py
View File

@@ -520,9 +520,14 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
compressed_extension): compressed_extension):
# maxsize measures the maximum filename length, including the ones to be # maxsize measures the maximum filename length, including the ones to be
# skipped. # skipped.
try:
maxsize = max( maxsize = max(
[len(os.path.basename(i.filename)) for i in input_tf_zip.infolist() [len(os.path.basename(i.filename)) for i in input_tf_zip.infolist()
if GetApkFileInfo(i.filename, compressed_extension, [])[0]]) if GetApkFileInfo(i.filename, compressed_extension, [])[0]])
except ValueError:
# Sets this to zero for targets without APK files, e.g., gki_arm64.
maxsize = 0
system_root_image = misc_info.get("system_root_image") == "true" system_root_image = misc_info.get("system_root_image") == "true"
for info in input_tf_zip.infolist(): for info in input_tf_zip.infolist():