Merge "releasetools: Add support for --override_timestamp." (19e700aa) · Commits · e / os / android_build

tools/releasetools/ota_from_target_files.py

+30 −10

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,19 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package
	will be replaced by "ota-downgrade=yes" in the metadata file. A data		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		wipe will always be enforced, so "ota-wipe=yes" will also be included in
	the metadata file. The update-binary in the source build will be used in		the metadata file. The update-binary in the source build will be used in
	the OTA package, unless --binary flag is specified.		the OTA package, unless --binary flag is specified. Please also check the
			doc for --override_timestamp below.

			--override_timestamp
			Intentionally generate an incremental OTA that updates from a newer
			build to an older one (based on timestamp comparison), by overriding the
			timestamp in package metadata. This differs from --downgrade flag: we
			know for sure this is NOT an actual downgrade case, but two builds are
			cut in a reverse order. A legit use case is that we cut a new build C
			(after having A and B), but want to enfore an update path of A -> C -> B.
			Specifying --downgrade may not help since that would enforce a data wipe
			for C -> B update. The value of "post-timestamp" will be set to the newer
			timestamp plus one, so that the package can be pushed and applied.

	-e (--extra_script) <file>		-e (--extra_script) <file>
	Insert the contents of file at the end of the update script.		Insert the contents of file at the end of the update script.
	@@ -149,6 +161,7 @@ OPTIONS.prohibit_verbatim = set(("system/build.prop",))
	OPTIONS.patch_threshold = 0.95		OPTIONS.patch_threshold = 0.95
	OPTIONS.wipe_user_data = False		OPTIONS.wipe_user_data = False
	OPTIONS.downgrade = False		OPTIONS.downgrade = False
			OPTIONS.timestamp = False
	OPTIONS.extra_script = None		OPTIONS.extra_script = None
	OPTIONS.worker_threads = multiprocessing.cpu_count() // 2		OPTIONS.worker_threads = multiprocessing.cpu_count() // 2
	if OPTIONS.worker_threads == 0:		if OPTIONS.worker_threads == 0:
	@@ -840,20 +853,21 @@ def HandleDowngradeMetadata(metadata):
	is_downgrade = long(post_timestamp) < long(pre_timestamp)		is_downgrade = long(post_timestamp) < long(pre_timestamp)

	if OPTIONS.downgrade:		if OPTIONS.downgrade:
	metadata["ota-downgrade"] = "yes"
	if not is_downgrade:		if not is_downgrade:
	raise RuntimeError("--downgrade specified but no downgrade detected: "		raise RuntimeError("--downgrade specified but no downgrade detected: "
	"pre: %s, post: %s" % (pre_timestamp, post_timestamp))		"pre: %s, post: %s" % (pre_timestamp, post_timestamp))
			metadata["ota-downgrade"] = "yes"
			elif OPTIONS.timestamp:
			if not is_downgrade:
			raise RuntimeError("--timestamp specified but no timestamp hack needed: "
			"pre: %s, post: %s" % (pre_timestamp, post_timestamp))
			metadata["post-timestamp"] = str(long(pre_timestamp) + 1)
	else:		else:
	if is_downgrade:		if is_downgrade:
	# Non-fatal here to allow generating such a package which may require		raise RuntimeError("Downgrade detected based on timestamp check: "
	# manual work to adjust the post-timestamp. A legit use case is that we		"pre: %s, post: %s. Need to specify --timestamp OR "
	# cut a new build C (after having A and B), but want to enfore the		"--downgrade to allow building the incremental." % (
	# update path of A -> C -> B. Specifying --downgrade may not help since		pre_timestamp, post_timestamp))
	# that would enforce a data wipe for C -> B update.
	print("\nWARNING: downgrade detected: pre: %s, post: %s.\n"
	"The package may not be deployed properly. "
	"Try --downgrade?\n" % (pre_timestamp, post_timestamp))
	metadata["post-timestamp"] = post_timestamp		metadata["post-timestamp"] = post_timestamp


	@@ -2075,6 +2089,8 @@ def main(argv):
	elif o == "--downgrade":		elif o == "--downgrade":
	OPTIONS.downgrade = True		OPTIONS.downgrade = True
	OPTIONS.wipe_user_data = True		OPTIONS.wipe_user_data = True
			elif o == "--override_timestamp":
			OPTIONS.timestamp = True
	elif o in ("-o", "--oem_settings"):		elif o in ("-o", "--oem_settings"):
	OPTIONS.oem_source = a.split(',')		OPTIONS.oem_source = a.split(',')
	elif o == "--oem_no_mount":		elif o == "--oem_no_mount":
	@@ -2127,6 +2143,7 @@ def main(argv):
	"full_bootloader",		"full_bootloader",
	"wipe_user_data",		"wipe_user_data",
	"downgrade",		"downgrade",
			"override_timestamp",
	"extra_script=",		"extra_script=",
	"worker_threads=",		"worker_threads=",
	"two_step",		"two_step",
	@@ -2159,6 +2176,9 @@ def main(argv):
	if OPTIONS.incremental_source is None:		if OPTIONS.incremental_source is None:
	raise ValueError("Cannot generate downgradable full OTAs")		raise ValueError("Cannot generate downgradable full OTAs")

			assert not (OPTIONS.downgrade and OPTIONS.timestamp), \
			"Cannot have --downgrade AND --override_timestamp both"

	# Load the dict file from the zip directly to have a peek at the OTA type.		# Load the dict file from the zip directly to have a peek at the OTA type.
	# For packages using A/B update, unzipping is not needed.		# For packages using A/B update, unzipping is not needed.
	input_zip = zipfile.ZipFile(args[0], "r")		input_zip = zipfile.ZipFile(args[0], "r")