Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bd7b8ed authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Switch from minigzip to gzip." into main am: ef9965e2 

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



Change-Id: I997a0616ced57fa6605de457df4d443c129ea839
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c187a5cd ef9965e2

libs/WindowManager/Shell/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -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 {

services/core/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -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 {