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

Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322c3 am: 412eb36668

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

Change-Id: Id6f0f4a08c1f5be05b387c5803ef3d37c6313fb4
This commit is contained in:
Treehugger Robot
2022-02-18 21:48:58 +00:00
committed by Automerger Merge Worker
parent ef29f976e7 412eb36668
commit 0f24066987
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/releasetools/ota_utils.py
View File

@@ -569,6 +569,7 @@ class PropertyFiles(object):
tokens.append('metadata.pb:' + ' ' * 15) tokens.append('metadata.pb:' + ' ' * 15)
else: else:
tokens.append(ComputeEntryOffsetSize(METADATA_NAME)) tokens.append(ComputeEntryOffsetSize(METADATA_NAME))
if METADATA_PROTO_NAME in zip_file.namelist():
tokens.append(ComputeEntryOffsetSize(METADATA_PROTO_NAME)) tokens.append(ComputeEntryOffsetSize(METADATA_PROTO_NAME))
return ','.join(tokens) return ','.join(tokens)