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

Commit f89a94dd authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Update protolog-class used by protolog tool in build rules 

We have moved the package of the protolog class out of common since we now use android dependencies in it. We must update the build rules for it to still process the protolog files properly.

Flag: EXEMPT build rule changes
Test: m droid
Change-Id: I5bed101a87c209b5bf420ed45e61818bb6737fa0
parent 3bbe5baa

libs/WindowManager/Shell/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) transform-protolog-calls " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +

        "--loggroups-jar $(location :wm_shell_protolog-groups) " +

        "--viewer-config-file-path /system_ext/etc/wmshell.protolog.pb " +
@@ -107,7 +107,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +

        "--loggroups-jar $(location :wm_shell_protolog-groups) " +

        "--viewer-config-type json " +
@@ -124,7 +124,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +

        "--loggroups-jar $(location :wm_shell_protolog-groups) " +

        "--viewer-config-type proto " +

services/core/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) transform-protolog-calls " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +

        "--loggroups-jar $(location :protolog-groups) " +

        "--viewer-config-file-path /etc/core.protolog.pb " +
@@ -66,7 +66,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +

        "--loggroups-jar $(location :protolog-groups) " +

        "--viewer-config-type json " +
@@ -83,7 +83,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) generate-viewer-config " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +

        "--loggroups-jar $(location :protolog-groups) " +

        "--viewer-config-type proto " +

services/tests/wmtests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ genrule { 
    ],

    tools: ["protologtool"],

    cmd: "$(location protologtool) transform-protolog-calls " +

        "--protolog-class com.android.internal.protolog.common.ProtoLog " +

        "--protolog-class com.android.internal.protolog.ProtoLog " +

        "--loggroups-class com.android.internal.protolog.ProtoLogGroup " +

        "--loggroups-jar $(location :protolog-groups) " +

        // Used for the ProtoLogIntegrationTest, where don't test decoding or writing to file