Commit 65bd6b73 authored Feb 18, 2022 by Treehugger Robot Committed by Automerger Merge Worker Feb 18, 2022

Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322...

Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322 am: 412eb366 am: 0f240669 am: 0f8f4979

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

Change-Id: I9864a7d6338de7309e604365bc56d25221d3ff2e

tools/releasetools/ota_utils.py

+2 −1

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

		return ','.join(tokens)