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

Commit b5f4aa32 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 70487d16 8ad73752

tools/releasetools/common.py

+6 −2
Original line number Diff line number Diff line
@@ -3052,15 +3052,19 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img, 


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

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

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



  if board_uses_vendorimage:

  if board_builds_vendorimage:

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

    recovery_img_path = "etc/recovery.img"

    recovery_resource_dat_path = "VENDOR/etc/recovery-resource.dat"

  else:

  elif not board_uses_vendorimage:

    # In this case the output sink is rooted at SYSTEM

    recovery_img_path = "vendor/etc/recovery.img"

    recovery_resource_dat_path = "SYSTEM/vendor/etc/recovery-resource.dat"

  else:

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

    return None



  if full_recovery_image:

    output_sink(recovery_img_path, recovery_img.data)

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/vendor"

    target_files_dir = "SYSTEM"



  def output_sink(fn, data):

    if target_files_dir is None: