From ff914f5dd0858552dad421b293f2dca0f2e8bb49 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Fri, 18 Dec 2015 13:24:56 +0000 Subject: [PATCH] build_image: remove an unnecessary call to append2simg append2simg on a large image is fairly slow, so append verity metadata to the hash tree to avoid two calls. Bug: 26251929 Change-Id: I5ec84dcd6e8500e990af13b1f9cef5e809b41605 --- tools/releasetools/build_image.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 2b8d4eefb2..afb1c2f1c6 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -182,13 +182,22 @@ def Append2Simg(sparse_image_path, unsparse_image_path, error_message): 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 + return True + def BuildVerifiedImage(data_image_path, verity_image_path, verity_metadata_path): - if not Append2Simg(data_image_path, verity_image_path, - "Could not append verity tree!"): + if not Append(verity_image_path, verity_metadata_path, + "Could not append verity metadata!"): return False - if not Append2Simg(data_image_path, verity_metadata_path, - "Could not append verity metadata!"): + if not Append2Simg(data_image_path, verity_image_path, + "Could not append verity data!"): return False return True