From da675a945f7742573ffee2637750c6a6db0c466c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 20 Jun 2023 16:36:41 -0700 Subject: [PATCH] Use the hermetic gzip instead of minigzip. Bug: http://b/288169261 Test: treehugger Change-Id: I7cb3d5468a79faedcae13d75913f11f5a8ea9e80 --- applypatch/imgdiff.cpp | 4 ++-- tests/Android.bp | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp index 376c511c..33ed3300 100644 --- a/applypatch/imgdiff.cpp +++ b/applypatch/imgdiff.cpp @@ -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. diff --git a/tests/Android.bp b/tests/Android.bp index b888d474..cdfc0918 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -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", ],