Commit 0f240669 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 am: 412eb366

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

Change-Id: Id6f0f4a08c1f5be05b387c5803ef3d37c6313fb4

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)