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

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

Change-Id: Iddf1728a8ac63b11daf06ad65a24582a164e04af
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

@@ -229,8 +229,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 {