Merge "Use the hermetic gzip instead of minigzip."

This commit is contained in:
Elliott Hughes 2023-06-29 14:23:54 +00:00 committed by Gerrit Code Review
commit c4e7b82c44
2 changed files with 3 additions and 6 deletions

View file

@ -30,8 +30,8 @@
*
* To work well with this tool, the gzipped sections of the target image must have been generated
* using the same deflate encoder that is available in applypatch, namely, the one in the zlib
* library. In practice this means that images should be compressed using the "minigzip" tool
* included in the zlib distribution, not the GNU gzip program.
* library. In practice this means that images should be compressed using the toybox "gzip" toy,
* not the GNU gzip program.
*
* An "imgdiff" patch consists of a header describing the chunk structure of the file and any
* encoding parameters needed for the gzipped chunks, followed by N bsdiff patches, one per chunk.

View file

@ -107,15 +107,12 @@ librecovery_static_libs = [
// ========================================================
genrule {
name: "recovery_image",
cmd: "cat $(location testdata/recovery_head) <(cat $(location testdata/recovery_body) | $(location minigzip)) $(location testdata/recovery_tail) > $(out)",
cmd: "cat $(location testdata/recovery_head) <(cat $(location testdata/recovery_body) | gzip) $(location testdata/recovery_tail) > $(out)",
srcs: [
"testdata/recovery_head",
"testdata/recovery_body",
"testdata/recovery_tail",
],
tools: [
"minigzip",
],
out: [
"testdata/recovery.img",
],