Merge "Switch command to subprocess in build_image.py" (36e612b7) · Commits · e / os / android_build

tools/releasetools/build_image.py

+32 −46

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import os.path
		import re
		import subprocess
		import sys
		import commands
		import common
		import shlex
		import shutil
		@@ -52,29 +51,24 @@ def RunCommand(cmd):
		return (output, p.returncode)

		def GetVerityFECSize(partition_size):
		cmd = "fec -s %d" % partition_size
		status, output = commands.getstatusoutput(cmd)
		if status:
		print output
		cmd = ["fec", "-s", str(partition_size)]
		output, exit_code = RunCommand(cmd)
		if exit_code != 0:
		return False, 0
		return True, int(output)

		def GetVerityTreeSize(partition_size):
		cmd = "build_verity_tree -s %d"
		cmd %= partition_size
		status, output = commands.getstatusoutput(cmd)
		if status:
		print output
		cmd = ["build_verity_tree", "-s", str(partition_size)]
		output, exit_code = RunCommand(cmd)
		if exit_code != 0:
		return False, 0
		return True, int(output)

		def GetVerityMetadataSize(partition_size):
		cmd = "system/extras/verity/build_verity_metadata.py size %d"
		cmd %= partition_size

		status, output = commands.getstatusoutput(cmd)
		if status:
		print output
		cmd = ["system/extras/verity/build_verity_metadata.py", "size",
		str(partition_size)]
		output, exit_code = RunCommand(cmd)
		if exit_code != 0:
		return False, 0
		return True, int(output)

		@@ -191,21 +185,19 @@ AdjustPartitionSizeForVerity.results = {}

		def BuildVerityFEC(sparse_image_path, verity_path, verity_fec_path,
		padding_size):
		cmd = "fec -e -p %d %s %s %s" % (padding_size, sparse_image_path,
		verity_path, verity_fec_path)
		print cmd
		status, output = commands.getstatusoutput(cmd)
		if status:
		cmd = ["fec", "-e", "-p", str(padding_size), sparse_image_path,
		verity_path, verity_fec_path]
		output, exit_code = RunCommand(cmd)
		if exit_code != 0:
		print "Could not build FEC data! Error: %s" % output
		return False
		return True

		def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict):
		cmd = "build_verity_tree -A %s %s %s" % (
		FIXED_SALT, sparse_image_path, verity_image_path)
		print cmd
		status, output = commands.getstatusoutput(cmd)
		if status:
		cmd = ["build_verity_tree", "-A", FIXED_SALT, sparse_image_path,
		verity_image_path]
		output, exit_code = RunCommand(cmd)
		if exit_code != 0:
		print "Could not build verity tree! Error: %s" % output
		return False
		root, salt = output.split()
		@@ -215,16 +207,13 @@ def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict):

		def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt,
		block_device, signer_path, key, signer_args):
		cmd_template = (
		"system/extras/verity/build_verity_metadata.py build " +
		"%s %s %s %s %s %s %s")
		cmd = cmd_template % (image_size, verity_metadata_path, root_hash, salt,
		block_device, signer_path, key)
		cmd = ["system/extras/verity/build_verity_metadata.py", "build",
		str(image_size), verity_metadata_path, root_hash, salt, block_device,
		signer_path, key]
		if signer_args:
		cmd += " --signer_args=\"%s\"" % (' '.join(signer_args),)
		print cmd
		status, output = commands.getstatusoutput(cmd)
		if status:
		cmd.append("--signer_args=\"%s\"" % (' '.join(signer_args),))
		output, exit_code = RunCommand(cmd)
		if exit_code != 0:
		print "Could not build verity metadata! Error: %s" % output
		return False
		return True
		@@ -238,22 +227,19 @@ def Append2Simg(sparse_image_path, unsparse_image_path, error_message):
		Returns:
		True on success, False on failure.
		"""
		cmd = "append2simg %s %s"
		cmd %= (sparse_image_path, unsparse_image_path)
		print cmd
		status, output = commands.getstatusoutput(cmd)
		if status:
		cmd = ["append2simg", sparse_image_path, unsparse_image_path]
		output, exit_code = RunCommand(cmd)
		if exit_code != 0:
		print "%s: %s" % (error_message, output)
		return False
		return True

		def Append(target, file_to_append, error_message):
		cmd = 'cat %s >> %s' % (file_to_append, target)
		print cmd
		status, output = commands.getstatusoutput(cmd)
		if status:
		print "%s: %s" % (error_message, output)
		return False
		print "appending %s to %s" % (file_to_append, target)
		with open(target, "a") as out_file:
		with open(file_to_append, "r") as input_file:
		for line in input_file:
		out_file.write(line)
		return True

		def BuildVerifiedImage(data_image_path, verity_image_path,