From e55f62c971b01daa1565d0e93ef27368180d573f Mon Sep 17 00:00:00 2001 From: Tianjie Date: Tue, 19 May 2020 13:44:26 -0700 Subject: [PATCH] Fix the syntax in install-recovery.sh We recently modify the logic in install-recovery.sh to support non-A/B updates on VAB launched devices. And the position of the $(getprop ro.boot.slot_suffix) is misplaced for the recovery image. For example: "if ! applypatch --check EMMC$(getprop ro.boot.slot_suffix):/dev/block/recovery:SHA1" should be: "if ! applypatch --check EMMC:/dev/block/recovery$(getprop ro.boot.slot_suffix):SHA1" Bug: 156979431 Test: rerun add_image_to_target_file, then validate_target_files Change-Id: Id2d45e281151a46d66b37ea8fdb7b5cb4ae72e81 --- tools/releasetools/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index c3d3394e83..e00825d4dd 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -2976,8 +2976,8 @@ fi 'recovery_sha1': recovery_img.sha1, 'boot_type': boot_type, 'boot_device': boot_device + '$(getprop ro.boot.slot_suffix)', - 'recovery_type': recovery_type + '$(getprop ro.boot.slot_suffix)', - 'recovery_device': recovery_device, + 'recovery_type': recovery_type, + 'recovery_device': recovery_device + '$(getprop ro.boot.slot_suffix)', 'bonus_args': bonus_args} # The install script location moved from /system/etc to /system/bin in the L