Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4e7b82c authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Use the hermetic gzip instead of minigzip."

parents 2b4e47be da675a94

applypatch/imgdiff.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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.

tests/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -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",

    ],