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

Commit 69d3feb2 authored by Bryan Henry's avatar Bryan Henry
Browse files

Don't suppress stderr for 'avbtool make_vbmeta_image' 

Output is useful for debugging.

Bug: 72837107
Test: Local sign_target_files_apks run of locally built target-files
Change-Id: I5c27fcc86fa3a51080e0502eb8f5f01a40b033c3
parent 97f21ac0

tools/releasetools/add_img_to_target_files.py

+8 −6
Original line number Diff line number Diff line
@@ -415,9 +415,10 @@ def AddVBMeta(output_zip, partitions): 
        assert found, 'failed to find %s' % (image_path,)

    cmd.extend(split_args)



  p = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

  p.communicate()

  assert p.returncode == 0, "avbtool make_vbmeta_image failed"

  p = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

  stdoutdata, _ = p.communicate()

  assert p.returncode == 0, \

      "avbtool make_vbmeta_image failed:\n{}".format(stdoutdata)

  img.Write()
@@ -444,9 +445,10 @@ def AddPartitionTable(output_zip): 
  if args:

    cmd.extend(shlex.split(args))



  p = common.Run(cmd, stdout=subprocess.PIPE)

  p.communicate()

  assert p.returncode == 0, "bpttool make_table failed"

  p = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

  stdoutdata, _ = p.communicate()

  assert p.returncode == 0, \

      "bpttool make_table failed:\n{}".format(stdoutdata)



  img.Write()

  bpt.Write()