diff options
| author | 2023-07-10 19:55:13 +0000 | |
|---|---|---|
| committer | 2023-07-10 19:55:13 +0000 | |
| commit | 2bd7b8edd7b974358ee113c6b9d54885e5f26dde (patch) | |
| tree | 364a2845d4fcbcb2d30e9308eafc146e43cebd5e | |
| parent | c187a5cdb0ad1444179e3e738f267adf04b051a9 (diff) | |
| parent | ef9965e2bc6c4ba46534192d215c58a8c9837776 (diff) | |
Merge "Switch from minigzip to gzip." into main am: ef9965e2bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2631992
Change-Id: I997a0616ced57fa6605de457df4d443c129ea839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/Android.bp | 3 | ||||
| -rw-r--r-- | services/core/Android.bp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index b3108feb50a5..66b02eff01ff 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -110,8 +110,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 { diff --git a/services/core/Android.bp b/services/core/Android.bp index 81f600e80c45..e687aa97c5a6 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -215,8 +215,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 { |