commit b1e99b5a745c14831247e748e36a84e39e4a4628
author Elliott Hughes <enh@google.com> Thu Jun 29 17:34:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 29 17:34:54 2023 +0000
tree b1bb6475528a9aa627d41319bb335052d60d570d
parent 22dec6ce02ae63c40381b6b10bb3e0014387b7ee
parent c41e77fba4c9c34a6269b04aa87a99bb3f7cd260

Switch to the hermetic toybox gzip. am: 615a1fced5 am: 8f47b62337 am: d3b6ee4295 am: c41e77fba4

Original change: https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/2631951

Change-Id: Idf2046f74fbfb7d99030ccd4557e3f512e5fd868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 1de0238..293b578 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,7 +79,6 @@
     ],
     required: [
         "lz4",
-        "minigzip",
         "mkbootfs",
         "mkbootimg",
         "toybox",

repack_bootimg.py

diff --git a/repack_bootimg.py b/repack_bootimg.py
index 93c28f9..a322a68 100755
--- a/repack_bootimg.py
+++ b/repack_bootimg.py
@@ -104,7 +104,7 @@
         # trying lz4 first.
         for compression_type, compression_util in [
             (RamdiskFormat.LZ4, 'lz4'),
-            (RamdiskFormat.GZIP, 'minigzip')]:
+            (RamdiskFormat.GZIP, 'gzip')]:
 
             # Command arguments:
             #   -d: decompression
@@ -141,7 +141,7 @@
         """
         compression_cmd = ['lz4', '-l', '-12', '--favor-decSpeed']
         if self._ramdisk_format == RamdiskFormat.GZIP:
-            compression_cmd = ['minigzip']
+            compression_cmd = ['gzip']
 
         print('Repacking ramdisk, which might take a few seconds ...')