Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322c3
am: 412eb36668
Original change: https://android-review.googlesource.com/c/platform/build/+/1879917 Change-Id: Id6f0f4a08c1f5be05b387c5803ef3d37c6313fb4
This commit is contained in:
commit
0f24066987
1 changed files with 2 additions and 1 deletions
|
@ -569,7 +569,8 @@ class PropertyFiles(object):
|
|||
tokens.append('metadata.pb:' + ' ' * 15)
|
||||
else:
|
||||
tokens.append(ComputeEntryOffsetSize(METADATA_NAME))
|
||||
tokens.append(ComputeEntryOffsetSize(METADATA_PROTO_NAME))
|
||||
if METADATA_PROTO_NAME in zip_file.namelist():
|
||||
tokens.append(ComputeEntryOffsetSize(METADATA_PROTO_NAME))
|
||||
|
||||
return ','.join(tokens)
|
||||
|
||||
|
|
Loading…
Reference in a new issue