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

Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: Id42a2d155af74eb7f885199d8761507216ceed03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kelvin Zhang
2023-04-05 17:18:11 +00:00
committed by Automerger Merge Worker
parent 3d396b837e 3aa4644117
commit c8e58a10a0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/common.py
View File

@@ -3605,11 +3605,13 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,
else: else:
system_root_image = info_dict.get("system_root_image") == "true" system_root_image = info_dict.get("system_root_image") == "true"
include_recovery_dtbo = info_dict.get("include_recovery_dtbo") == "true"
include_recovery_acpio = info_dict.get("include_recovery_acpio") == "true"
path = os.path.join(input_dir, recovery_resource_dat_path) path = os.path.join(input_dir, recovery_resource_dat_path)
# With system-root-image, boot and recovery images will have mismatching # With system-root-image, boot and recovery images will have mismatching
# entries (only recovery has the ramdisk entry) (Bug: 72731506). Use bsdiff # entries (only recovery has the ramdisk entry) (Bug: 72731506). Use bsdiff
# to handle such a case. # to handle such a case.
if system_root_image: if system_root_image or include_recovery_dtbo or include_recovery_acpio:
diff_program = ["bsdiff"] diff_program = ["bsdiff"]
bonus_args = "" bonus_args = ""
assert not os.path.exists(path) assert not os.path.exists(path)