Merge "Use the update-binary in the source build for downgrade OTAs." (6be54d77) · Commits · e / os / android_build

tools/releasetools/ota_from_target_files.py

+15 −3

Original line number	Diff line number	Diff line
		@@ -74,7 +74,8 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
		build to an older one (based on timestamp comparison). "post-timestamp"
		will be replaced by "ota-downgrade=yes" in the metadata file. A data
		wipe will always be enforced, so "ota-wipe=yes" will also be included in
		the metadata file.
		the metadata file. The update-binary in the source build will be used in
		the OTA package, unless --binary flag is specified.

		-e (--extra_script) <file>
		Insert the contents of file at the end of the update script.
		@@ -1056,6 +1057,11 @@ endif;
		""" % bcb_dev)

		script.SetProgress(1)
		# For downgrade OTAs, we prefer to use the update-binary in the source
		# build that is actually newer than the one in the target build.
		if OPTIONS.downgrade:
		script.AddToZip(source_zip, output_zip, input_path=OPTIONS.updater_binary)
		else:
		script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary)
		metadata["ota-required-cache"] = str(script.required_cache)
		WriteMetadata(metadata, output_zip)
		@@ -1804,6 +1810,12 @@ endif;
		script.Unmount("/vendor")
		script.Mount("/vendor", recovery_mount_options)
		vendor_diff.EmitExplicitTargetVerification(script)

		# For downgrade OTAs, we prefer to use the update-binary in the source
		# build that is actually newer than the one in the target build.
		if OPTIONS.downgrade:
		script.AddToZip(source_zip, output_zip, input_path=OPTIONS.updater_binary)
		else:
		script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary)

		metadata["ota-required-cache"] = str(script.required_cache)