Merge "Fix the error that free_string is not defined." (edb88c94) · Commits · e / os / android_build

tools/releasetools/blockimgdiff.py

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -294,6 +294,8 @@ class BlockImageDiff(object):
	if stashed_blocks > max_stashed_blocks:		if stashed_blocks > max_stashed_blocks:
	max_stashed_blocks = stashed_blocks		max_stashed_blocks = stashed_blocks

			free_string = []

	if self.version == 1:		if self.version == 1:
	src_string = xf.src_ranges.to_string_raw()		src_string = xf.src_ranges.to_string_raw()
	elif self.version >= 2:		elif self.version >= 2:
	@@ -306,7 +308,6 @@ class BlockImageDiff(object):

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

	unstashed_src_ranges = xf.src_ranges		unstashed_src_ranges = xf.src_ranges
	mapped_stashes = []		mapped_stashes = []