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

Commit f5fe4096 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents fba97a3c 2da41b24

tools/releasetools/common.py

+1 −5
Original line number Diff line number Diff line
@@ -3875,12 +3875,8 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img, 
  board_uses_vendorimage = info_dict.get("board_uses_vendorimage") == "true"

  board_builds_vendorimage =  info_dict.get("board_builds_vendorimage") == "true"



  if board_builds_vendorimage:

    # In this case, the output sink is rooted at VENDOR

  if board_builds_vendorimage or not board_uses_vendorimage:

    recovery_img_path = "etc/recovery.img"

  elif not board_uses_vendorimage:

    # In this case the output sink is rooted at SYSTEM

    recovery_img_path = "vendor/etc/recovery.img"

  else:

    logger.warning('Recovery patch generation is disable when prebuilt vendor image is used.')

    return None

tools/releasetools/make_recovery_patch.py

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ def main(argv): 
  if board_builds_vendorimage:

    target_files_dir = "VENDOR"

  elif not board_uses_vendorimage:

    target_files_dir = "SYSTEM"

    target_files_dir = "SYSTEM/vendor"



  def output_sink(fn, data):

    if target_files_dir is None: