Use the hermetic gzip instead of minigzip.
Bug: http://b/288169261
Test: treehugger
Change-Id: I7cb3d5468a79faedcae13d75913f11f5a8ea9e80
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index 376c511..33ed330 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 b888d47..cdfc091 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -107,15 +107,12 @@
// ========================================================
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",
],