summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-08 13:45:17 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-08 13:45:17 +0000
commita5884c02a48caa6916b63f19c45d00adf856958b (patch)
tree906748579daa8af83ff9e0979fe1e57965de1e5c /libs
parent7a54c63ed9cc9f35fa46e7eb71d251c30b79de9a (diff)
parent7edc95c32aeb65a71874d6d15e500e1a30834a94 (diff)
Merge "Ensure WMShell protolog viewer config is available on device when required" into main
Diffstat (limited to 'libs')
-rw-r--r--libs/WindowManager/Shell/Android.bp12
1 files changed, 8 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp
index e493ed1110c8..4642fe59bcb2 100644
--- a/libs/WindowManager/Shell/Android.bp
+++ b/libs/WindowManager/Shell/Android.bp
@@ -234,10 +234,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",
],
@@ -246,3 +242,11 @@ android_library {
plugins: ["dagger2-compiler"],
use_resource_processor: true,
}
+
+java_defaults {
+ name: "wmshell_defaults",
+ required: [
+ "wmshell.protolog.json.gz",
+ "wmshell.protolog.pb",
+ ],
+}