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

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

Change-Id: I00c4c0fffbcf98fbbade1428f83a3ad37158b1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes
2023-07-10 21:19:51 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 4 deletions

View File

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

View File

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