Merge "Switch from minigzip to gzip." into main am: ef9965e2bc am: 2bd7b8edd7 am: f1293aed8e am: cb73cb1269 am: 67af07835e am: 884f641374

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2631992

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

libs/WindowManager/Shell/Android.bp

@@ -115,8 +115,7 @@ genrule {
     name: "protolog.json.gz",
     srcs: [":generate-wm_shell_protolog.json"],
     out: ["wmshell.protolog.json.gz"],
-    cmd: "$(location minigzip) -c < $(in) > $(out)",
-    tools: ["minigzip"],
+    cmd: "gzip -c < $(in) > $(out)",
 }
 
 prebuilt_etc {

services/core/Android.bp

@@ -230,8 +230,7 @@ genrule {
     name: "services.core.json.gz",
     srcs: [":checked-protolog.json"],
     out: ["services.core.protolog.json.gz"],
-    cmd: "$(location minigzip) -c < $(in) > $(out)",
-    tools: ["minigzip"],
+    cmd: "gzip -c < $(in) > $(out)",
 }
 
 prebuilt_etc {