Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c734083d authored by Sami Tolvanen's avatar Sami Tolvanen Committed by android-build-merger
Browse files

Merge "build_image: remove an unnecessary call to append2simg"

am: 06b4ff66

* commit '06b4ff66':
  build_image: remove an unnecessary call to append2simg
parents f2f5294c 06b4ff66
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -182,14 +182,23 @@ 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!"):
    return False
  if not Append2Simg(data_image_path, verity_metadata_path,
  if not Append(verity_image_path, verity_metadata_path,
                "Could not append verity metadata!"):
    return False
  if not Append2Simg(data_image_path, verity_image_path,
                     "Could not append verity data!"):
    return False
  return True

def UnsparseImage(sparse_image_path, replace=True):