resolved conflicts for merge of 8787cd6d to mnc-dev (8bd72025) · Commits · e / os / android_build

tools/releasetools/sparse_img.py

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -221,8 +221,13 @@ class SparseImage(object):
	nonzero_blocks.append(b)		nonzero_blocks.append(b)
	nonzero_blocks.append(b+1)		nonzero_blocks.append(b+1)

			assert zero_blocks or nonzero_blocks or clobbered_blocks

			if zero_blocks:
	out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)		out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)
			if nonzero_blocks:
	out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)		out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)
			if clobbered_blocks:
	out["__COPY"] = clobbered_blocks		out["__COPY"] = clobbered_blocks

	def ResetFileMap(self):		def ResetFileMap(self):