Merge "releasetools: Address two issues with system_root_image file map." (81421ccf) · Commits · e / os / android_build

tools/releasetools/common.py

+16 −3

Original line number	Diff line number	Diff line
		@@ -654,12 +654,25 @@ def GetSparseImage(which, tmpdir, input_zip, allow_shared_blocks):
		# if they contain all zeros. We can't reconstruct such a file from its block
		# list. Tag such entries accordingly. (Bug: 65213616)
		for entry in image.file_map:
		# "/system/framework/am.jar" => "SYSTEM/framework/am.jar".
		arcname = string.replace(entry, which, which.upper(), 1)[1:]
		# Skip artificial names, such as "__ZERO", "__NONZERO-1".
		if arcname not in input_zip.namelist():
		if not entry.startswith('/'):
		continue

		# "/system/framework/am.jar" => "SYSTEM/framework/am.jar". Note that when
		# using system_root_image, the filename listed in system.map may contain an
		# additional leading slash (i.e. "//system/framework/am.jar"). Using lstrip
		# to get consistent results.
		arcname = string.replace(entry, which, which.upper(), 1).lstrip('/')

		# Special handling another case with system_root_image, where files not
		# under /system (e.g. "/sbin/charger") are packed under ROOT/ in a
		# target_files.zip.
		if which == 'system' and not arcname.startswith('SYSTEM'):
		arcname = 'ROOT/' + arcname

		assert arcname in input_zip.namelist(), \
		"Failed to find the ZIP entry for {}".format(entry)

		info = input_zip.getinfo(arcname)
		ranges = image.file_map[entry]

tools/releasetools/test_common.py

+68 −0

Original line number	Diff line number	Diff line
		@@ -662,6 +662,74 @@ class CommonUtilsTest(unittest.TestCase):
		self.assertFalse(sparse_image.file_map['/system/file1'].extra)
		self.assertTrue(sparse_image.file_map['/system/file2'].extra['incomplete'])

		def test_GetSparseImage_systemRootImage_filenameWithExtraLeadingSlash(self):
		target_files = common.MakeTempFile(prefix='target_files-', suffix='.zip')
		with zipfile.ZipFile(target_files, 'w') as target_files_zip:
		target_files_zip.write(
		test_utils.construct_sparse_image([(0xCAC2, 16)]),
		arcname='IMAGES/system.img')
		target_files_zip.writestr(
		'IMAGES/system.map',
		'\n'.join([
		'//system/file1 1-5 9-10',
		'//system/file2 11-12',
		'/system/app/file3 13-15']))
		target_files_zip.writestr('SYSTEM/file1', os.urandom(4096 * 7))
		# '/system/file2' has less blocks listed (2) than actual (3).
		target_files_zip.writestr('SYSTEM/file2', os.urandom(4096 * 3))
		# '/system/app/file3' has less blocks listed (3) than actual (4).
		target_files_zip.writestr('SYSTEM/app/file3', os.urandom(4096 * 4))

		tempdir = common.UnzipTemp(target_files)
		with zipfile.ZipFile(target_files, 'r') as input_zip:
		sparse_image = common.GetSparseImage('system', tempdir, input_zip, False)

		self.assertFalse(sparse_image.file_map['//system/file1'].extra)
		self.assertTrue(sparse_image.file_map['//system/file2'].extra['incomplete'])
		self.assertTrue(
		sparse_image.file_map['/system/app/file3'].extra['incomplete'])

		def test_GetSparseImage_systemRootImage_nonSystemFiles(self):
		target_files = common.MakeTempFile(prefix='target_files-', suffix='.zip')
		with zipfile.ZipFile(target_files, 'w') as target_files_zip:
		target_files_zip.write(
		test_utils.construct_sparse_image([(0xCAC2, 16)]),
		arcname='IMAGES/system.img')
		target_files_zip.writestr(
		'IMAGES/system.map',
		'\n'.join([
		'//system/file1 1-5 9-10',
		'//init.rc 13-15']))
		target_files_zip.writestr('SYSTEM/file1', os.urandom(4096 * 7))
		# '/init.rc' has less blocks listed (3) than actual (4).
		target_files_zip.writestr('ROOT/init.rc', os.urandom(4096 * 4))

		tempdir = common.UnzipTemp(target_files)
		with zipfile.ZipFile(target_files, 'r') as input_zip:
		sparse_image = common.GetSparseImage('system', tempdir, input_zip, False)

		self.assertFalse(sparse_image.file_map['//system/file1'].extra)
		self.assertTrue(sparse_image.file_map['//init.rc'].extra['incomplete'])

		def test_GetSparseImage_fileNotFound(self):
		target_files = common.MakeTempFile(prefix='target_files-', suffix='.zip')
		with zipfile.ZipFile(target_files, 'w') as target_files_zip:
		target_files_zip.write(
		test_utils.construct_sparse_image([(0xCAC2, 16)]),
		arcname='IMAGES/system.img')
		target_files_zip.writestr(
		'IMAGES/system.map',
		'\n'.join([
		'//system/file1 1-5 9-10',
		'//system/file2 11-12']))
		target_files_zip.writestr('SYSTEM/file1', os.urandom(4096 * 7))

		tempdir = common.UnzipTemp(target_files)
		with zipfile.ZipFile(target_files, 'r') as input_zip:
		self.assertRaises(
		AssertionError, common.GetSparseImage, 'system', tempdir, input_zip,
		False)


		class InstallRecoveryScriptFormatTest(unittest.TestCase):
		"""Checks the format of install-recovery.sh.