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

Commit e1d6a532 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make non-ab code path compatible with extracted target files" into main am: 61f81a68 

Original change: https://android-review.googlesource.com/c/platform/build/+/2808357



Change-Id: I96fdee77a50c9a26d8ec54b193fd3fc9dadf8401
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da7e14b9 61f81a68

tools/releasetools/common.py

+4 −14
Original line number Diff line number Diff line
@@ -1235,12 +1235,7 @@ def _FindAndLoadRecoveryFstab(info_dict, input_file, read_helper): 
  system_root_image = info_dict.get('system_root_image') == 'true'

  if info_dict.get('no_recovery') != 'true':

    recovery_fstab_path = 'RECOVERY/RAMDISK/system/etc/recovery.fstab'

    if isinstance(input_file, zipfile.ZipFile):

      if recovery_fstab_path not in input_file.namelist():

        recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab'

    else:

      path = os.path.join(input_file, *recovery_fstab_path.split('/'))

      if not os.path.exists(path):

    if not DoesInputFileContain(input_file, recovery_fstab_path):

      recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab'

    return LoadRecoveryFSTab(

        read_helper, info_dict['fstab_version'], recovery_fstab_path,
@@ -1248,12 +1243,7 @@ def _FindAndLoadRecoveryFstab(info_dict, input_file, read_helper): 


  if info_dict.get('recovery_as_boot') == 'true':

    recovery_fstab_path = 'BOOT/RAMDISK/system/etc/recovery.fstab'

    if isinstance(input_file, zipfile.ZipFile):

      if recovery_fstab_path not in input_file.namelist():

        recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab'

    else:

      path = os.path.join(input_file, *recovery_fstab_path.split('/'))

      if not os.path.exists(path):

    if not DoesInputFileContain(input_file, recovery_fstab_path):

      recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab'

    return LoadRecoveryFSTab(

        read_helper, info_dict['fstab_version'], recovery_fstab_path,