tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make non-ab code path compatible with extracted target files" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-10-27 19:32:48 +00:00 committed by Gerrit Code Review
commit 61f81a68d8
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/releasetools/common.py
View file

@ -1235,26 +1235,16 @@ def _FindAndLoadRecoveryFstab(info_dict, input_file, read_helper):
system_root_image = info_dict.get('system_root_image') == 'true' system_root_image = info_dict.get('system_root_image') == 'true'
if info_dict.get('no_recovery') != 'true': if info_dict.get('no_recovery') != 'true':
recovery_fstab_path = 'RECOVERY/RAMDISK/system/etc/recovery.fstab' recovery_fstab_path = 'RECOVERY/RAMDISK/system/etc/recovery.fstab'
if isinstance(input_file, zipfile.ZipFile): if not DoesInputFileContain(input_file, recovery_fstab_path):
if recovery_fstab_path not in input_file.namelist(): recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab'
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):
recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab'
return LoadRecoveryFSTab( return LoadRecoveryFSTab(
read_helper, info_dict['fstab_version'], recovery_fstab_path, read_helper, info_dict['fstab_version'], recovery_fstab_path,
system_root_image) system_root_image)
if info_dict.get('recovery_as_boot') == 'true': if info_dict.get('recovery_as_boot') == 'true':
recovery_fstab_path = 'BOOT/RAMDISK/system/etc/recovery.fstab' recovery_fstab_path = 'BOOT/RAMDISK/system/etc/recovery.fstab'
if isinstance(input_file, zipfile.ZipFile): if not DoesInputFileContain(input_file, recovery_fstab_path):
if recovery_fstab_path not in input_file.namelist(): recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab'
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):
recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab'
return LoadRecoveryFSTab( return LoadRecoveryFSTab(
read_helper, info_dict['fstab_version'], recovery_fstab_path, read_helper, info_dict['fstab_version'], recovery_fstab_path,
system_root_image) system_root_image)