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

Commit 146366bf authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am b6339d74: am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice." 

* commit 'b6339d74':
  Fix up a few callers of GetTypeAndDevice.
parents ee8323b6 b6339d74

tools/releasetools/common.py

+4 −7
Original line number Diff line number Diff line
@@ -1252,14 +1252,11 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img, 
  _, _, patch = d.ComputePatch()

  output_sink("recovery-from-boot.p", patch)



  td_pair = GetTypeAndDevice("/boot", info_dict)

  if not td_pair:

    return

  boot_type, boot_device = td_pair

  td_pair = GetTypeAndDevice("/recovery", info_dict)

  if not td_pair:

  try:

    boot_type, boot_device = GetTypeAndDevice("/boot", info_dict)

    recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict)

  except KeyError:

    return

  recovery_type, recovery_device = td_pair



  sh = """#!/system/bin/sh

if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(recovery_size)d:%(recovery_sha1)s; then