tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use the hermetic gzip instead of minigzip." am: c4e7b82c44 am: ebb6d026f0 am: a8e558b721 am: 36524249e6 am: cd0a72c926 am: edf0153bd8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2631950

Change-Id: I43f0f77fe5964b3cd49df22f32bf0d67b6c1d5e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-06-29 19:18:11 +00:00 committed by Automerger Merge Worker
commit e699795e84
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applypatch/imgdiff.cpp
View file

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

5
tests/Android.bp
View file

@ -107,15 +107,12 @@ librecovery_static_libs = [
// ======================================================== // ========================================================
genrule { genrule {
name: "recovery_image", 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: [ srcs: [
"testdata/recovery_head", "testdata/recovery_head",
"testdata/recovery_body", "testdata/recovery_body",
"testdata/recovery_tail", "testdata/recovery_tail",
], ],
tools: [
"minigzip",
],
out: [ out: [
"testdata/recovery.img", "testdata/recovery.img",
], ],