StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move recovery-from-boot.p from /system to /vendor

Browse Source 
The file was missed when moving recovery resources, but the assertion
path was changed, as a result non-Treble devices failed to build.

Fixes: Ia4045bd67ffb3d899efa8d20dab4c4299b87ee5f
Change-Id: Ib7822a9bd5b1a2ab7e762e9fb35dbb22291a3a76
This commit is contained in:
dianlujitao
2020-09-12 13:48:26 +08:00
committed by SkyMinus
parent 6d06aad39d
commit 6a1b8b765e
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/common.py
View File

@@ -3797,12 +3797,10 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,
# In this case, the output sink is rooted at VENDOR # In this case, the output sink is rooted at VENDOR
recovery_img_path = "etc/recovery.img" recovery_img_path = "etc/recovery.img"
recovery_resource_dat_path = "VENDOR/etc/recovery-resource.dat" recovery_resource_dat_path = "VENDOR/etc/recovery-resource.dat"
sh_dir = "bin"
else: else:
# In this case the output sink is rooted at SYSTEM # In this case the output sink is rooted at SYSTEM
recovery_img_path = "vendor/etc/recovery.img" recovery_img_path = "vendor/etc/recovery.img"
recovery_resource_dat_path = "SYSTEM/vendor/etc/recovery-resource.dat" recovery_resource_dat_path = "SYSTEM/vendor/etc/recovery-resource.dat"
sh_dir = "vendor/bin"
if full_recovery_image: if full_recovery_image:
output_sink(recovery_img_path, recovery_img.data) output_sink(recovery_img_path, recovery_img.data)
@@ -3884,11 +3882,7 @@ fi
# The install script location moved from /system/etc to /system/bin in the L # The install script location moved from /system/etc to /system/bin in the L
# release. In the R release it is in VENDOR/bin or SYSTEM/vendor/bin. # release. In the R release it is in VENDOR/bin or SYSTEM/vendor/bin.
sh_location = os.path.join(sh_dir, "install-recovery.sh") output_sink("bin/install-recovery.sh", sh.encode())
logger.info("putting script in %s", sh_location)
output_sink(sh_location, sh.encode())
class DynamicPartitionUpdate(object): class DynamicPartitionUpdate(object):

2
tools/releasetools/make_recovery_patch.py
View File

@@ -53,7 +53,7 @@ def main(argv):
if board_uses_vendorimage: if board_uses_vendorimage:
target_files_dir = "VENDOR" target_files_dir = "VENDOR"
else: else:
target_files_dir = "SYSTEM" target_files_dir = "SYSTEM/vendor"
def output_sink(fn, data): def output_sink(fn, data):
with open(os.path.join(output_dir, target_files_dir, with open(os.path.join(output_dir, target_files_dir,