diff --git a/core/Makefile b/core/Makefile index acf8a78612..3998099ac2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1243,8 +1243,6 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/make_ext4fs \ $(HOST_OUT_EXECUTABLES)/simg2img \ $(HOST_OUT_EXECUTABLES)/e2fsck \ - $(HOST_OUT_EXECUTABLES)/xdelta3 \ - $(HOST_OUT_EXECUTABLES)/syspatch_host \ $(HOST_OUT_EXECUTABLES)/build_verity_tree \ $(HOST_OUT_EXECUTABLES)/verity_signer \ $(HOST_OUT_EXECUTABLES)/append2simg \ diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 3f8cda7ecb..714f71b119 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1037,31 +1037,6 @@ def ParseCertificate(data): cert = "".join(cert).decode('base64') return cert -def XDelta3(source_path, target_path, output_path): - diff_program = ["xdelta3", "-0", "-B", str(64<<20), "-e", "-f", "-s"] - diff_program.append(source_path) - diff_program.append(target_path) - diff_program.append(output_path) - p = Run(diff_program, stdin=subprocess.PIPE, stdout=subprocess.PIPE) - p.communicate() - assert p.returncode == 0, "Couldn't produce patch" - -def XZ(path): - compress_program = ["xz", "-zk", "-9", "--check=crc32"] - compress_program.append(path) - p = Run(compress_program, stdin=subprocess.PIPE, stdout=subprocess.PIPE) - p.communicate() - assert p.returncode == 0, "Couldn't compress patch" - -def MakePartitionPatch(source_file, target_file, partition): - with tempfile.NamedTemporaryFile() as output_file: - XDelta3(source_file.name, target_file.name, output_file.name) - XZ(output_file.name) - with open(output_file.name + ".xz") as patch_file: - patch_data = patch_file.read() - os.unlink(patch_file.name) - return File(partition + ".muimg.p", patch_data) - def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img, info_dict=None): """Generate a binary patch that creates the recovery image starting