resolved conflicts for merge of 4c32aa3d to lmp-mr1-dev-plus-aosp (eecf00db) · Commits · e / os / android_build

tools/releasetools/add_img_to_target_files.py

+26 −26

Original line number	Diff line number	Diff line
		@@ -60,9 +60,9 @@ def AddSystem(output_zip, prefix="IMAGES/", recovery_img=None, boot_img=None):
		ofile.close()

		if OPTIONS.rebuild_recovery:
		print("Building new recovery patch")
		common.MakeRecoveryPatch(OPTIONS.input_tmp, output_sink, recovery_img, boot_img,
		info_dict=OPTIONS.info_dict)
		print "Building new recovery patch"
		common.MakeRecoveryPatch(OPTIONS.input_tmp, output_sink, recovery_img,
		boot_img, info_dict=OPTIONS.info_dict)

		block_list = common.MakeTempFile(prefix="system-blocklist-", suffix=".map")
		imgname = BuildSystem(OPTIONS.input_tmp, OPTIONS.info_dict,
		@@ -110,12 +110,12 @@ def CreateImage(input_dir, info_dict, what, block_list=None):
		try:
		os.symlink(os.path.join(input_dir, what.upper()),
		os.path.join(input_dir, what))
		except OSError, e:
		except OSError as e:
		# bogus error on my mac version?
		# File "./build/tools/releasetools/img_from_target_files", line 86, in AddSystem
		# File "./build/tools/releasetools/img_from_target_files"
		# os.path.join(OPTIONS.input_tmp, "system"))
		# OSError: [Errno 17] File exists
		if (e.errno == errno.EEXIST):
		if e.errno == errno.EEXIST:
		pass

		image_props = build_image.ImagePropFromGlobalDict(info_dict, what)
		@@ -130,10 +130,12 @@ def CreateImage(input_dir, info_dict, what, block_list=None):

		fs_config = os.path.join(
		input_dir, "META/" + fs_config_prefix + "filesystem_config.txt")
		if not os.path.exists(fs_config): fs_config = None
		if not os.path.exists(fs_config):
		fs_config = None

		fc_config = os.path.join(input_dir, "BOOT/RAMDISK/file_contexts")
		if not os.path.exists(fc_config): fc_config = None
		if not os.path.exists(fc_config):
		fc_config = None

		# Override values loaded from info_dict.
		if fs_config:
		@@ -298,7 +300,7 @@ def AddImagesToTargetFiles(filename):
		output_zip.close()

		def main(argv):
		def option_handler(o, a):
		def option_handler(o, _):
		if o in ("-a", "--add_missing"):
		OPTIONS.add_missing = True
		elif o in ("-r", "--rebuild_recovery",):
		@@ -307,11 +309,9 @@ def main(argv):
		return False
		return True

		args = common.ParseOptions(argv, __doc__,
		extra_opts="ar",
		extra_long_opts=["add_missing",
		"rebuild_recovery",
		],
		args = common.ParseOptions(
		argv, __doc__, extra_opts="ar",
		extra_long_opts=["add_missing", "rebuild_recovery"],
		extra_option_handler=option_handler)


		@@ -326,7 +326,7 @@ if __name__ == '__main__':
		try:
		common.CloseInheritedPipes()
		main(sys.argv[1:])
		except common.ExternalError, e:
		except common.ExternalError as e:
		print
		print " ERROR: %s" % (e,)
		print

tools/releasetools/blockimgdiff.py

+82 −35

Original line number	Diff line number	Diff line
		@@ -20,17 +20,17 @@ import heapq
		import itertools
		import multiprocessing
		import os
		import pprint
		import re
		import subprocess
		import sys
		import threading
		import tempfile

		from rangelib import *
		from rangelib import RangeSet


		__all__ = ["EmptyImage", "DataImage", "BlockImageDiff"]


		def compute_patch(src, tgt, imgdiff=False):
		srcfd, srcfile = tempfile.mkstemp(prefix="src-")
		tgtfd, tgtfile = tempfile.mkstemp(prefix="tgt-")
		@@ -69,7 +69,16 @@ def compute_patch(src, tgt, imgdiff=False):
		except OSError:
		pass

		class EmptyImage(object):

		class Image(object):
		def ReadRangeSet(self, ranges):
		raise NotImplementedError

		def TotalSha1(self):
		raise NotImplementedError


		class EmptyImage(Image):
		"""A zero-length image."""
		blocksize = 4096
		care_map = RangeSet()
		@@ -81,7 +90,7 @@ class EmptyImage(object):
		return sha1().hexdigest()


		class DataImage(object):
		class DataImage(Image):
		"""An image wrapped around a single string of data."""

		def __init__(self, data, trim=False, pad=False):
		@@ -126,9 +135,7 @@ class DataImage(object):
		return [self.data[sself.blocksize:eself.blocksize] for (s, e) in ranges]

		def TotalSha1(self):
		if not hasattr(self, "sha1"):
		self.sha1 = sha1(self.data).hexdigest()
		return self.sha1
		return sha1(self.data).hexdigest()


		class Transfer(object):
		@@ -196,9 +203,13 @@ class BlockImageDiff(object):
		def __init__(self, tgt, src=None, threads=None, version=2):
		if threads is None:
		threads = multiprocessing.cpu_count() // 2
		if threads == 0: threads = 1
		if threads == 0:
		threads = 1
		self.threads = threads
		self.version = version
		self.transfers = []
		self.src_basenames = {}
		self.src_numpatterns = {}

		assert version in (1, 2)

		@@ -247,6 +258,15 @@ class BlockImageDiff(object):
		self.ComputePatches(prefix)
		self.WriteTransfers(prefix)

		def HashBlocks(self, source, ranges): # pylint: disable=no-self-use
		data = source.ReadRangeSet(ranges)
		ctx = sha1()

		for p in data:
		ctx.update(p)

		return ctx.hexdigest()

		def WriteTransfers(self, prefix):
		out = []

		@@ -283,8 +303,8 @@ class BlockImageDiff(object):
		free_string = []

		if self.version == 1:
		src_string = xf.src_ranges.to_string_raw()
		elif self.version == 2:
		src_str = xf.src_ranges.to_string_raw()
		elif self.version >= 2:

		# <# blocks> <src ranges>
		# OR
		@@ -293,7 +313,7 @@ class BlockImageDiff(object):
		# <# blocks> - <stash refs...>

		size = xf.src_ranges.size()
		src_string = [str(size)]
		src_str = [str(size)]

		unstashed_src_ranges = xf.src_ranges
		mapped_stashes = []
		@@ -303,21 +323,29 @@ class BlockImageDiff(object):
		unstashed_src_ranges = unstashed_src_ranges.subtract(sr)
		sr = xf.src_ranges.map_within(sr)
		mapped_stashes.append(sr)
		src_string.append("%d:%s" % (sid, sr.to_string_raw()))
		if self.version == 2:
		src_str.append("%d:%s" % (sid, sr.to_string_raw()))
		else:
		assert sh in stashes
		src_str.append("%s:%s" % (sh, sr.to_string_raw()))
		stashes[sh] -= 1
		if stashes[sh] == 0:
		free_string.append("free %s\n" % (sh))
		stashes.pop(sh)
		heapq.heappush(free_stash_ids, sid)

		if unstashed_src_ranges:
		src_string.insert(1, unstashed_src_ranges.to_string_raw())
		src_str.insert(1, unstashed_src_ranges.to_string_raw())
		if xf.use_stash:
		mapped_unstashed = xf.src_ranges.map_within(unstashed_src_ranges)
		src_string.insert(2, mapped_unstashed.to_string_raw())
		src_str.insert(2, mapped_unstashed.to_string_raw())
		mapped_stashes.append(mapped_unstashed)
		self.AssertPartition(RangeSet(data=(0, size)), mapped_stashes)
		else:
		src_string.insert(1, "-")
		src_str.insert(1, "-")
		self.AssertPartition(RangeSet(data=(0, size)), mapped_stashes)

		src_string = " ".join(src_string)
		src_str = " ".join(src_str)

		# both versions:
		# zero <rangeset>
		@@ -330,9 +358,14 @@ class BlockImageDiff(object):
		# move <src rangeset> <tgt rangeset>
		#
		# version 2:
		# bsdiff patchstart patchlen <tgt rangeset> <src_string>
		# imgdiff patchstart patchlen <tgt rangeset> <src_string>
		# move <tgt rangeset> <src_string>
		# bsdiff patchstart patchlen <tgt rangeset> <src_str>
		# imgdiff patchstart patchlen <tgt rangeset> <src_str>
		# move <tgt rangeset> <src_str>
		#
		# version 3:
		# bsdiff patchstart patchlen srchash tgthash <tgt rangeset> <src_str>
		# imgdiff patchstart patchlen srchash tgthash <tgt rangeset> <src_str>
		# move hash <tgt rangeset> <src_str>

		tgt_size = xf.tgt_ranges.size()

		@@ -352,7 +385,12 @@ class BlockImageDiff(object):
		elif self.version == 2:
		out.append("%s %s %s\n" % (
		xf.style,
		xf.tgt_ranges.to_string_raw(), src_string))
		xf.tgt_ranges.to_string_raw(), src_str))
		elif self.version >= 3:
		out.append("%s %s %s %s\n" % (
		xf.style,
		self.HashBlocks(self.tgt, xf.tgt_ranges),
		xf.tgt_ranges.to_string_raw(), src_str))
		total += tgt_size
		elif xf.style in ("bsdiff", "imgdiff"):
		performs_read = True
		@@ -365,7 +403,14 @@ class BlockImageDiff(object):
		elif self.version == 2:
		out.append("%s %d %d %s %s\n" % (
		xf.style, xf.patch_start, xf.patch_len,
		xf.tgt_ranges.to_string_raw(), src_string))
		xf.tgt_ranges.to_string_raw(), src_str))
		elif self.version >= 3:
		out.append("%s %d %d %s %s %s %s\n" % (
		xf.style,
		xf.patch_start, xf.patch_len,
		self.HashBlocks(self.src, xf.src_ranges),
		self.HashBlocks(self.tgt, xf.tgt_ranges),
		xf.tgt_ranges.to_string_raw(), src_str))
		total += tgt_size
		elif xf.style == "zero":
		assert xf.tgt_ranges
		@@ -374,8 +419,10 @@ class BlockImageDiff(object):
		out.append("%s %s\n" % (xf.style, to_zero.to_string_raw()))
		total += to_zero.size()
		else:
		raise ValueError, "unknown transfer style '%s'\n" % (xf.style,)
		raise ValueError("unknown transfer style '%s'\n" % xf.style)

		if free_string:
		out.append("".join(free_string))

		# sanity check: abort if we're going to need more than 512 MB if
		# stash space
		@@ -481,11 +528,13 @@ class BlockImageDiff(object):

		patches = [None] * patch_num

		# TODO: Rewrite with multiprocessing.ThreadPool?
		lock = threading.Lock()
		def diff_worker():
		while True:
		with lock:
		if not diff_q: return
		if not diff_q:
		return
		tgt_size, src, tgt, xf, patchnum = diff_q.pop()
		patch = compute_patch(src, tgt, imgdiff=(xf.style == "imgdiff"))
		size = len(patch)
		@@ -497,7 +546,7 @@ class BlockImageDiff(object):
		xf.tgt_name + " (from " + xf.src_name + ")")))

		threads = [threading.Thread(target=diff_worker)
		for i in range(self.threads)]
		for _ in range(self.threads)]
		for th in threads:
		th.start()
		while threads:
		@@ -624,8 +673,6 @@ class BlockImageDiff(object):
		stash_size = 0

		for xf in self.transfers:
		lost = 0
		size = xf.src_ranges.size()
		for u in xf.goes_before.copy():
		# xf should go before u
		if xf.order < u.order:
		@@ -691,7 +738,8 @@ class BlockImageDiff(object):
		# Put all sinks at the end of the sequence.
		while True:
		sinks = [u for u in G if not u.outgoing]
		if not sinks: break
		if not sinks:
		break
		for u in sinks:
		s2.appendleft(u)
		del G[u]
		@@ -701,14 +749,16 @@ class BlockImageDiff(object):
		# Put all the sources at the beginning of the sequence.
		while True:
		sources = [u for u in G if not u.incoming]
		if not sources: break
		if not sources:
		break
		for u in sources:
		s1.append(u)
		del G[u]
		for iu in u.outgoing:
		del iu.incoming[u]

		if not G: break
		if not G:
		break

		# Find the "best" vertex to put next. "Best" is the one that
		# maximizes the net difference in source blocks saved we get by
		@@ -746,7 +796,8 @@ class BlockImageDiff(object):
		print("Generating digraph...")
		for a in self.transfers:
		for b in self.transfers:
		if a is b: continue
		if a is b:
		continue

		# If the blocks written by A are read by B, then B needs to go before A.
		i = a.tgt_ranges.intersect(b.src_ranges)
		@@ -761,7 +812,6 @@ class BlockImageDiff(object):
		a.goes_after[b] = size

		def FindTransfers(self):
		self.transfers = []
		empty = RangeSet()
		for tgt_fn, tgt_ranges in self.tgt.file_map.items():
		if tgt_fn == "__ZERO":
		@@ -801,9 +851,6 @@ class BlockImageDiff(object):
		Transfer(tgt_fn, None, tgt_ranges, empty, "new", self.transfers)

		def AbbreviateSourceNames(self):
		self.src_basenames = {}
		self.src_numpatterns = {}

		for k in self.src.file_map.keys():
		b = os.path.basename(k)
		self.src_basenames[b] = k

tools/releasetools/build_image.py

+23 −24

Original line number	Diff line number	Diff line
		@@ -72,14 +72,15 @@ def AdjustPartitionSizeForVerity(partition_size):
		"""
		success, verity_tree_size = GetVerityTreeSize(partition_size)
		if not success:
		return 0;
		return 0
		success, verity_metadata_size = GetVerityMetadataSize(partition_size)
		if not success:
		return 0
		return partition_size - verity_tree_size - verity_metadata_size

		def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict):
		cmd = ("build_verity_tree -A %s %s %s" % (FIXED_SALT, sparse_image_path, verity_image_path))
		cmd = "build_verity_tree -A %s %s %s" % (
		FIXED_SALT, sparse_image_path, verity_image_path)
		print cmd
		status, output = commands.getstatusoutput(cmd)
		if status:
		@@ -92,14 +93,10 @@ def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict):

		def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
		block_device, signer_path, key):
		cmd = ("system/extras/verity/build_verity_metadata.py %s %s %s %s %s %s %s" %
		(image_size,
		verity_metadata_path,
		root_hash,
		salt,
		block_device,
		signer_path,
		key))
		cmd_template = (
		"system/extras/verity/build_verity_metadata.py %s %s %s %s %s %s %s")
		cmd = cmd_template % (image_size, verity_metadata_path, root_hash, salt,
		block_device, signer_path, key)
		print cmd
		status, output = commands.getstatusoutput(cmd)
		if status:
		@@ -125,10 +122,13 @@ def Append2Simg(sparse_image_path, unsparse_image_path, error_message):
		return False
		return True

		def BuildVerifiedImage(data_image_path, verity_image_path, verity_metadata_path):
		if not Append2Simg(data_image_path, verity_metadata_path, "Could not append verity metadata!"):
		def BuildVerifiedImage(data_image_path, verity_image_path,
		verity_metadata_path):
		if not Append2Simg(data_image_path, verity_metadata_path,
		"Could not append verity metadata!"):
		return False
		if not Append2Simg(data_image_path, verity_image_path, "Could not append verity tree!"):
		if not Append2Simg(data_image_path, verity_image_path,
		"Could not append verity tree!"):
		return False
		return True

		@@ -153,7 +153,8 @@ def MakeVerityEnabledImage(out_file, prop_dict):

		Args:
		out_file: the location to write the verifiable image at
		prop_dict: a dictionary of properties required for image creation and verification
		prop_dict: a dictionary of properties required for image creation and
		verification
		Returns:
		True on success, False otherwise.
		"""
		@@ -178,13 +179,8 @@ def MakeVerityEnabledImage(out_file, prop_dict):
		# build the metadata blocks
		root_hash = prop_dict["verity_root_hash"]
		salt = prop_dict["verity_salt"]
		if not BuildVerityMetadata(image_size,
		verity_metadata_path,
		root_hash,
		salt,
		block_dev,
		signer_path,
		signer_key):
		if not BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
		block_dev, signer_path, signer_key):
		shutil.rmtree(tempdir_name, ignore_errors=True)
		return False

		@@ -237,7 +233,8 @@ def BuildImage(in_dir, prop_dict, out_file):

		is_verity_partition = "verity_block_device" in prop_dict
		verity_supported = prop_dict.get("verity") == "true"
		# adjust the partition size to make room for the hashes if this is to be verified
		# adjust the partition size to make room for the hashes if this is to be
		# verified
		if verity_supported and is_verity_partition:
		partition_size = int(prop_dict.get("partition_size"))
		adjusted_size = AdjustPartitionSizeForVerity(partition_size)
		@@ -355,7 +352,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
		d["mount_point"] = mount_point
		if mount_point == "system":
		copy_prop("fs_type", "fs_type")
		# Copy the generic sysetem fs type first, override with specific one if available.
		# Copy the generic sysetem fs type first, override with specific one if
		# available.
		copy_prop("system_fs_type", "fs_type")
		copy_prop("system_size", "partition_size")
		copy_prop("system_journal_size", "journal_size")
		@@ -430,7 +428,8 @@ def main(argv):
		image_properties = ImagePropFromGlobalDict(glob_dict, mount_point)

		if not BuildImage(in_dir, image_properties, out_file):
		print >> sys.stderr, "error: failed to build %s from %s" % (out_file, in_dir)
		print >> sys.stderr, "error: failed to build %s from %s" % (out_file,
		in_dir)
		exit(1)

tools/releasetools/check_target_files_signatures

deleted100755 → 0

+1 −441

File deleted.

Preview size limit exceeded, changes collapsed.

tools/releasetools/check_target_files_signatures

0 → 120000

+1 −441

Original line number	Diff line number	Diff line
		check_target_files_signatures.py
		No newline at end of file