Merge "Fix the signing error on no-system-image targets" am: 790214a4c9
am: ba922579b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1936199 Change-Id: I74abbf8b433aa0db2cc7d9bfde0ba59386e8a0aa
This commit is contained in:
@@ -520,9 +520,14 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
|
||||
compressed_extension):
|
||||
# maxsize measures the maximum filename length, including the ones to be
|
||||
# skipped.
|
||||
try:
|
||||
maxsize = max(
|
||||
[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"
|
||||
|
||||
for info in input_tf_zip.infolist():
|
||||
|
Reference in New Issue
Block a user