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

Commit 884f6413 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 am: 2bd7b8ed... 

Merge "Switch from minigzip to gzip." into main am: ef9965e2 am: 2bd7b8ed am: f1293aed am: cb73cb12 am: 67af0783

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



Change-Id: Iddf1728a8ac63b11daf06ad65a24582a164e04af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48b8cc2d 67af0783

libs/WindowManager/Shell/Android.bp

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

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