Merge "releasetools: Remove dead functions in EdifyGenerator." (c87b38f5) · Commits · e / os / android_build

core/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -2052,9 +2052,7 @@ ifdef PRODUCT_EXTRA_RECOVERY_KEYS
		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 "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
		$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
		$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
		$(hide) echo "blockimgdiff_versions=1,2,3,4" >> $(zip_root)/META/misc_info.txt
		ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
		# OTA scripts are only interested in fingerprint related properties

tools/releasetools/edify_generator.py

+0 −72

Original line number	Diff line number	Diff line
		@@ -277,36 +277,6 @@ class EdifyGenerator(object):

		self.script.append('wipe_block_device("%s", %s);' % (device, size))

		def DeleteFiles(self, file_list):
		"""Delete all files in file_list."""
		if not file_list:
		return
		cmd = "delete(" + ",\0".join(['"%s"' % (i,) for i in file_list]) + ");"
		self.script.append(self.WordWrap(cmd))

		def DeleteFilesIfNotMatching(self, file_list):
		"""Delete the file in file_list if not matching the checksum."""
		if not file_list:
		return
		for name, sha1 in file_list:
		cmd = ('sha1_check(read_file("{name}"), "{sha1}") \|\| '
		'delete("{name}");'.format(name=name, sha1=sha1))
		self.script.append(self.WordWrap(cmd))

		def RenameFile(self, srcfile, tgtfile):
		"""Moves a file from one location to another."""
		if self.info.get("update_rename_support", False):
		self.script.append('rename("%s", "%s");' % (srcfile, tgtfile))
		else:
		raise ValueError("Rename not supported by update binary")

		def SkipNextActionIfTargetExists(self, tgtfile, tgtsha1):
		"""Prepend an action with an apply_patch_check in order to
		skip the action if the file exists. Used when a patch
		is later renamed."""
		cmd = ('sha1_check(read_file("%s"), %s) \|\|' % (tgtfile, tgtsha1))
		self.script.append(self.WordWrap(cmd))

		def ApplyPatch(self, srcfile, tgtfile, tgtsize, tgtsha1, *patchpairs):
		"""Apply binary patches (in *patchpairs) to the given srcfile to
		produce tgtfile (which may be "-" to indicate overwriting the
		@@ -343,48 +313,6 @@ class EdifyGenerator(object):
		raise ValueError(
		"don't know how to write \"%s\" partitions" % p.fs_type)

		def SetPermissions(self, fn, uid, gid, mode, selabel, capabilities):
		"""Set file ownership and permissions."""
		if not self.info.get("use_set_metadata", False):
		self.script.append('set_perm(%d, %d, 0%o, "%s");' % (uid, gid, mode, fn))
		else:
		if capabilities is None:
		capabilities = "0x0"
		cmd = 'set_metadata("%s", "uid", %d, "gid", %d, "mode", 0%o, ' \
		'"capabilities", %s' % (fn, uid, gid, mode, capabilities)
		if selabel is not None:
		cmd += ', "selabel", "%s"' % selabel
		cmd += ');'
		self.script.append(cmd)

		def SetPermissionsRecursive(self, fn, uid, gid, dmode, fmode, selabel,
		capabilities):
		"""Recursively set path ownership and permissions."""
		if not self.info.get("use_set_metadata", False):
		self.script.append('set_perm_recursive(%d, %d, 0%o, 0%o, "%s");'
		% (uid, gid, dmode, fmode, fn))
		else:
		if capabilities is None:
		capabilities = "0x0"
		cmd = 'set_metadata_recursive("%s", "uid", %d, "gid", %d, ' \
		'"dmode", 0%o, "fmode", 0%o, "capabilities", %s' \
		% (fn, uid, gid, dmode, fmode, capabilities)
		if selabel is not None:
		cmd += ', "selabel", "%s"' % selabel
		cmd += ');'
		self.script.append(cmd)

		def MakeSymlinks(self, symlink_list):
		"""Create symlinks, given a list of (dest, link) pairs."""
		by_dest = {}
		for d, l in symlink_list:
		by_dest.setdefault(d, []).append(l)

		for dest, links in sorted(by_dest.iteritems()):
		cmd = ('symlink("%s", ' % (dest,) +
		",\0".join(['"' + i + '"' for i in sorted(links)]) + ");")
		self.script.append(self.WordWrap(cmd))

		def AppendExtra(self, extra):
		"""Append text verbatim to the output script."""
		self.script.append(extra)