summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/WindowManager/Shell/Android.bp12
-rw-r--r--packages/SystemUI/Android.bp1
2 files changed, 9 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",
+ ],
+}
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",