am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py. (46ae586a) · Commits · e / os / android_build

tools/releasetools/common.py

+9 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,8 @@ class Options(object):
		self.device_specific = None
		self.extras = {}
		self.info_dict = None
		self.source_info_dict = None
		self.target_info_dict = None
		self.worker_threads = None


		@@ -1195,7 +1197,11 @@ class BlockDifference(object):
		self.path = os.path.join(tmpdir, partition)
		b.Compute(self.path)

		if src is None:
		_, self.device = GetTypeAndDevice("/" + partition, OPTIONS.info_dict)
		else:
		_, self.device = GetTypeAndDevice("/" + partition,
		OPTIONS.source_info_dict)

		def WriteScript(self, script, output_zip, progress=None):
		if not self.src:
		@@ -1393,6 +1399,8 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,
		output_sink("recovery-from-boot.p", patch)

		try:
		# The following GetTypeAndDevice()s need to use the path in the target
		# info_dict instead of source_info_dict.
		boot_type, boot_device = GetTypeAndDevice("/boot", info_dict)
		recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict)
		except KeyError:

+2 −2

Original line number	Diff line number	Diff line
		@@ -759,7 +759,7 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
		output_zip=output_zip,
		script=script,
		metadata=metadata,
		info_dict=OPTIONS.info_dict)
		info_dict=OPTIONS.source_info_dict)

		# TODO: Currently this works differently from WriteIncrementalOTAPackage().
		# This function doesn't consider thumbprints when writing
		@@ -1159,7 +1159,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
		output_zip=output_zip,
		script=script,
		metadata=metadata,
		info_dict=OPTIONS.info_dict)
		info_dict=OPTIONS.source_info_dict)

		system_diff = FileDifference("system", source_zip, target_zip, output_zip)
		script.Mount("/system", recovery_mount_options)