diff options
| author | 2024-10-07 11:17:50 +0000 | |
|---|---|---|
| committer | 2024-10-07 18:38:25 +0000 | |
| commit | 7edc95c32aeb65a71874d6d15e500e1a30834a94 (patch) | |
| tree | 14f4d406833fd5226af9fd343ddad3415cf5d266 | |
| parent | a90ea9c8049e2672a8c1bafc06f0ffce47c99c4d (diff) | |
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
| -rw-r--r-- | libs/WindowManager/Shell/Android.bp | 12 | ||||
| -rw-r--r-- | packages/SystemUI/Android.bp | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp index a796eccd53ba..cee7b418710e 100644 --- a/libs/WindowManager/Shell/Android.bp +++ b/libs/WindowManager/Shell/Android.bp @@ -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", + ], +} diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index bd7067bc1293..1f10eadd115b 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -1022,6 +1022,7 @@ android_app { defaults: [ "platform_app_defaults", "SystemUI_optimized_defaults", + "wmshell_defaults", ], static_libs: [ "SystemUI-core", |