Merge "releasetools: Drop the support for BBOTA v1 and v2." (c3e34061) · Commits · e / os / android_build

core/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2053,7 +2053,7 @@ endif
		$(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $(zip_root)/META/misc_info.txt
		$(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $(zip_root)/META/misc_info.txt
		$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
		$(hide) echo "blockimgdiff_versions=1,2,3,4" >> $(zip_root)/META/misc_info.txt
		$(hide) echo "blockimgdiff_versions=3,4" >> $(zip_root)/META/misc_info.txt
		ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
		# OTA scripts are only interested in fingerprint related properties
		$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt

tools/releasetools/blockimgdiff.py

+99 −205

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ class BlockImageDiff(object):
		self.touched_src_sha1 = None
		self.disable_imgdiff = disable_imgdiff

		assert version in (1, 2, 3, 4)
		assert version in (3, 4)

		self.tgt = tgt
		if src is None:
		@@ -333,14 +333,11 @@ class BlockImageDiff(object):
		self.FindVertexSequence()
		# Fix up the ordering dependencies that the sequence didn't
		# satisfy.
		if self.version == 1:
		self.RemoveBackwardEdges()
		else:
		self.ReverseBackwardEdges()
		self.ImproveVertexSequence()

		# Ensure the runtime stash size is under the limit.
		if self.version >= 2 and common.OPTIONS.cache_size is not None:
		if common.OPTIONS.cache_size is not None:
		self.ReviseStashSize()

		# Double-check our work.
		@@ -369,13 +366,6 @@ class BlockImageDiff(object):
		out = []
		total = 0

		# In BBOTA v2, 'stashes' records the map from 'stash_raw_id' to 'stash_id'
		# (aka 'sid', which is the stash slot id). The stash in a 'stash_id' will
		# be freed immediately after its use. So unlike 'stash_raw_id' (which
		# uniquely identifies each pair of stashed blocks), the same 'stash_id'
		# may be reused during the life cycle of an update (maintained by
		# 'free_stash_ids' heap and 'next_stash_id').
		#
		# In BBOTA v3+, it uses the hash of the stashed blocks as the stash slot
		# id. 'stashes' records the map from 'hash' to the ref count. The stash
		# will be freed only if the count decrements to zero.
		@@ -383,28 +373,9 @@ class BlockImageDiff(object):
		stashed_blocks = 0
		max_stashed_blocks = 0

		if self.version == 2:
		free_stash_ids = []
		next_stash_id = 0

		for xf in self.transfers:

		if self.version < 2:
		assert not xf.stash_before
		assert not xf.use_stash

		for stash_raw_id, sr in xf.stash_before:
		if self.version == 2:
		assert stash_raw_id not in stashes
		if free_stash_ids:
		sid = heapq.heappop(free_stash_ids)
		else:
		sid = next_stash_id
		next_stash_id += 1
		stashes[stash_raw_id] = sid
		stashed_blocks += sr.size()
		out.append("stash %d %s\n" % (sid, sr.to_string_raw()))
		else:
		for _, sr in xf.stash_before:
		sh = self.src.RangeSha1(sr)
		if sh in stashes:
		stashes[sh] += 1
		@@ -420,10 +391,6 @@ class BlockImageDiff(object):
		free_string = []
		free_size = 0

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

		# <# blocks> <src ranges>
		# OR
		# <# blocks> <src ranges> <src locs> <stash refs...>
		@@ -435,23 +402,11 @@ class BlockImageDiff(object):

		unstashed_src_ranges = xf.src_ranges
		mapped_stashes = []
		for stash_raw_id, sr in xf.use_stash:
		for _, sr in xf.use_stash:
		unstashed_src_ranges = unstashed_src_ranges.subtract(sr)
		sh = self.src.RangeSha1(sr)
		sr = xf.src_ranges.map_within(sr)
		mapped_stashes.append(sr)
		if self.version == 2:
		sid = stashes.pop(stash_raw_id)
		src_str.append("%d:%s" % (sid, sr.to_string_raw()))
		# A stash will be used only once. We need to free the stash
		# immediately after the use, instead of waiting for the automatic
		# clean-up at the end. Because otherwise it may take up extra space
		# and lead to OTA failures.
		# Bug: 23119955
		free_string.append("free %d\n" % (sid,))
		free_size += sr.size()
		heapq.heappush(free_stash_ids, sid)
		else:
		assert sh in stashes
		src_str.append("%s:%s" % (sh, sr.to_string_raw()))
		stashes[sh] -= 1
		@@ -473,22 +428,10 @@ class BlockImageDiff(object):

		src_str = " ".join(src_str)

		# all versions:
		# version 3+:
		# zero <rangeset>
		# new <rangeset>
		# erase <rangeset>
		#
		# version 1:
		# bsdiff patchstart patchlen <src rangeset> <tgt rangeset>
		# imgdiff patchstart patchlen <src rangeset> <tgt rangeset>
		# move <src rangeset> <tgt rangeset>
		#
		# version 2:
		# 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>
		@@ -503,15 +446,6 @@ class BlockImageDiff(object):
		assert xf.tgt_ranges
		assert xf.src_ranges.size() == tgt_size
		if xf.src_ranges != xf.tgt_ranges:
		if self.version == 1:
		out.append("%s %s %s\n" % (
		xf.style,
		xf.src_ranges.to_string_raw(), xf.tgt_ranges.to_string_raw()))
		elif self.version == 2:
		out.append("%s %s %s\n" % (
		xf.style,
		xf.tgt_ranges.to_string_raw(), src_str))
		elif self.version >= 3:
		# take into account automatic stashing of overlapping blocks
		if xf.src_ranges.overlaps(xf.tgt_ranges):
		temp_stash_usage = stashed_blocks + xf.src_ranges.size()
		@@ -529,23 +463,13 @@ class BlockImageDiff(object):
		elif xf.style in ("bsdiff", "imgdiff"):
		assert xf.tgt_ranges
		assert xf.src_ranges
		if self.version == 1:
		out.append("%s %d %d %s %s\n" % (
		xf.style, xf.patch_start, xf.patch_len,
		xf.src_ranges.to_string_raw(), xf.tgt_ranges.to_string_raw()))
		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_str))
		elif self.version >= 3:
		# take into account automatic stashing of overlapping blocks
		if xf.src_ranges.overlaps(xf.tgt_ranges):
		temp_stash_usage = stashed_blocks + xf.src_ranges.size()
		if temp_stash_usage > max_stashed_blocks:
		max_stashed_blocks = temp_stash_usage

		self.touched_src_ranges = self.touched_src_ranges.union(
		xf.src_ranges)
		self.touched_src_ranges = self.touched_src_ranges.union(xf.src_ranges)

		out.append("%s %d %d %s %s %s %s\n" % (
		xf.style,
		@@ -566,7 +490,7 @@ class BlockImageDiff(object):
		out.append("".join(free_string))
		stashed_blocks -= free_size

		if self.version >= 2 and common.OPTIONS.cache_size is not None:
		if common.OPTIONS.cache_size is not None:
		# Sanity check: abort if we're going to need more stash space than
		# the allowed size (cache_size * threshold). There are two purposes
		# of having a threshold here. a) Part of the cache may have been
		@@ -581,7 +505,6 @@ class BlockImageDiff(object):
		self.tgt.blocksize, max_allowed, cache_size,
		stash_threshold)

		if self.version >= 3:
		self.touched_src_sha1 = self.src.RangeSha1(self.touched_src_ranges)

		# Zero out extended blocks as a workaround for bug 20881595.
		@@ -610,12 +533,6 @@ class BlockImageDiff(object):

		out.insert(0, "%d\n" % (self.version,)) # format version number
		out.insert(1, "%d\n" % (total,))
		if self.version == 2:
		# v2 only: after the total block count, we give the number of stash slots
		# needed, and the maximum size needed (in blocks).
		out.insert(2, str(next_stash_id) + "\n")
		out.insert(3, str(max_stashed_blocks) + "\n")
		elif self.version >= 3:
		# v3+: the number of stash slots is unused.
		out.insert(2, "0\n")
		out.insert(3, str(max_stashed_blocks) + "\n")
		@@ -624,7 +541,6 @@ class BlockImageDiff(object):
		for i in out:
		f.write(i)

		if self.version >= 2:
		self._max_stashed_size = max_stashed_blocks * self.tgt.blocksize
		OPTIONS = common.OPTIONS
		if OPTIONS.cache_size is not None:
		@@ -663,10 +579,6 @@ class BlockImageDiff(object):
		stashed_blocks = 0
		new_blocks = 0

		if self.version == 2:
		free_stash_ids = []
		next_stash_id = 0

		# Now go through all the commands. Compute the required stash size on the
		# fly. If a command requires excess stash than available, it deletes the
		# stash by replacing the command that uses the stash with a "new" command
		@@ -678,9 +590,6 @@ class BlockImageDiff(object):
		for stash_raw_id, sr in xf.stash_before:
		# Check the post-command stashed_blocks.
		stashed_blocks_after = stashed_blocks
		if self.version == 2:
		stashed_blocks_after += sr.size()
		else:
		sh = self.src.RangeSha1(sr)
		if sh not in stashes:
		stashed_blocks_after += sr.size()
		@@ -693,15 +602,6 @@ class BlockImageDiff(object):
		print("%10d %9s %s" % (sr.size(), "explicit", use_cmd))
		else:
		# Update the stashes map.
		if self.version == 2:
		assert stash_raw_id not in stashes
		if free_stash_ids:
		sid = heapq.heappop(free_stash_ids)
		else:
		sid = next_stash_id
		next_stash_id += 1
		stashes[stash_raw_id] = sid
		else:
		if sh in stashes:
		stashes[sh] += 1
		else:
		@@ -710,7 +610,7 @@ class BlockImageDiff(object):

		# "move" and "diff" may introduce implicit stashes in BBOTA v3. Prior to
		# ComputePatches(), they both have the style of "diff".
		if xf.style == "diff" and self.version >= 3:
		if xf.style == "diff":
		assert xf.tgt_ranges and xf.src_ranges
		if xf.src_ranges.overlaps(xf.tgt_ranges):
		if stashed_blocks + xf.src_ranges.size() > max_allowed:
		@@ -732,12 +632,7 @@ class BlockImageDiff(object):
		cmd.ConvertToNew()

		# xf.use_stash may generate free commands.
		for stash_raw_id, sr in xf.use_stash:
		if self.version == 2:
		sid = stashes.pop(stash_raw_id)
		stashed_blocks -= sr.size()
		heapq.heappush(free_stash_ids, sid)
		else:
		for _, sr in xf.use_stash:
		sh = self.src.RangeSha1(sr)
		assert sh in stashes
		stashes[sh] -= 1
		@@ -911,7 +806,6 @@ class BlockImageDiff(object):
		# Check that the input blocks for this transfer haven't yet been touched.

		x = xf.src_ranges
		if self.version >= 2:
		for _, sr in xf.use_stash:
		x = x.subtract(sr)

		@@ -1364,7 +1258,7 @@ class BlockImageDiff(object):
		elif tgt_fn in self.src.file_map:
		# Look for an exact pathname match in the source.
		AddTransfer(tgt_fn, tgt_fn, tgt_ranges, self.src.file_map[tgt_fn],
		"diff", self.transfers, self.version >= 3)
		"diff", self.transfers, True)
		continue

		b = os.path.basename(tgt_fn)
		@@ -1372,7 +1266,7 @@ class BlockImageDiff(object):
		# Look for an exact basename match in the source.
		src_fn = self.src_basenames[b]
		AddTransfer(tgt_fn, src_fn, tgt_ranges, self.src.file_map[src_fn],
		"diff", self.transfers, self.version >= 3)
		"diff", self.transfers, True)
		continue

		b = re.sub("[0-9]+", "#", b)
		@@ -1383,7 +1277,7 @@ class BlockImageDiff(object):
		# that get bumped.)
		src_fn = self.src_numpatterns[b]
		AddTransfer(tgt_fn, src_fn, tgt_ranges, self.src.file_map[src_fn],
		"diff", self.transfers, self.version >= 3)
		"diff", self.transfers, True)
		continue

		AddTransfer(tgt_fn, None, tgt_ranges, empty, "new", self.transfers)

tools/releasetools/common.py

+8 −11

Original line number	Diff line number	Diff line
		@@ -1340,6 +1340,7 @@ class BlockDifference(object):
		version = max(
		int(i) for i in
		OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
		assert version >= 3
		self.version = version

		b = blockimgdiff.BlockImageDiff(tgt, src, threads=OPTIONS.worker_threads,
		@@ -1404,7 +1405,7 @@ class BlockDifference(object):

		# incremental OTA
		else:
		if touched_blocks_only and self.version >= 3:
		if touched_blocks_only:
		ranges = self.touched_src_ranges
		expected_sha1 = self.touched_src_sha1
		else:
		@@ -1416,16 +1417,12 @@ class BlockDifference(object):
		return

		ranges_str = ranges.to_string_raw()
		if self.version >= 3:
		script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" \|\| '
		'block_image_verify("%s", '
		'package_extract_file("%s.transfer.list"), '
		'"%s.new.dat", "%s.patch.dat")) then') % (
		self.device, ranges_str, expected_sha1,
		self.device, partition, partition, partition))
		else:
		script.AppendExtra('if range_sha1("%s", "%s") == "%s" then' % (
		self.device, ranges_str, self.src.TotalSha1()))
		script.Print('Verified %s image...' % (partition,))
		script.AppendExtra('else')