Merge "Fix the signing error on no-system-image targets"

This commit is contained in:
Treehugger Robot 2022-01-06 06:27:17 +00:00 committed by Gerrit Code Review
commit 790214a4c9

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.
maxsize = max( try:
[len(os.path.basename(i.filename)) for i in input_tf_zip.infolist() maxsize = max(
if GetApkFileInfo(i.filename, compressed_extension, [])[0]]) [len(os.path.basename(i.filename)) for i in input_tf_zip.infolist()
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():