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

Commit 7edc95c3 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Ensure WMShell protolog viewer config is available on device when required 

Currently, this file is only added to Google SysUI app, which means that we can't use ProtoLog in aosp builds which is causing issues.

The require rule only applies to installed modules and is not propagated on static dependencies.

Bug: 371524079
Flag: EXEMPT updating build rules
Test: m droid with aosp target, flash and check `/system_ext/etc/wmshell.protolog.pb` is on the device
Change-Id: Id1fbd5cf9716af45f8872a35e98d6cbb4f5f8f50
parent a90ea9c8

libs/WindowManager/Shell/Android.bp

+8 −4
Original line number Diff line number Diff line
@@ -233,10 +233,6 @@ android_library { 
        // *.kt sources are inside a filegroup.

        "kotlin-annotations",

    ],

    required: [

        "wmshell.protolog.json.gz",

        "wmshell.protolog.pb",

    ],

    flags_packages: [

        "com_android_wm_shell_flags",

    ],
@@ -245,3 +241,11 @@ android_library { 
    plugins: ["dagger2-compiler"],

    use_resource_processor: true,

}



java_defaults {

    name: "wmshell_defaults",

    required: [

        "wmshell.protolog.json.gz",

        "wmshell.protolog.pb",

    ],

}

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,7 @@ android_app { 
    defaults: [

        "platform_app_defaults",

        "SystemUI_optimized_defaults",

        "wmshell_defaults",

    ],

    static_libs: [

        "SystemUI-core",