summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dave Mankoff <mankoff@google.com> 2025-01-16 08:15:33 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-01-16 08:15:33 -0800
commit7d5b30c1273061f1c0400f115421364fae9e24d2 (patch)
treeceed14a8a2add39ed86a14782c119ac4acb81568
parent170e92cac452dc4684a279c398b661d0176904d1 (diff)
parent05c134cdb0d2bd7a77a4124943dbdf80800e1822 (diff)
Merge "Add bindingGraphFix flag for Dagger." into main
-rw-r--r--packages/SystemUI/Android.bp7
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index c3c23e305822..15f4e5af6477 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -596,6 +596,7 @@ android_library {
"-Adagger.fastInit=enabled",
"-Adagger.explicitBindingConflictsWithInject=ERROR",
"-Adagger.strictMultibindingValidation=enabled",
+ "-Adagger.useBindingGraphFix=ENABLED",
"-Aroom.schemaLocation=frameworks/base/packages/SystemUI/schemas",
],
kotlincflags: ["-Xjvm-default=all"],
@@ -815,6 +816,10 @@ android_library {
// TODO(b/352363800): Why do we need this?
"-J-Xmx8192M",
],
+ javacflags: [
+ "-Adagger.useBindingGraphFix=ENABLED",
+ ],
+
aaptflags: [
"--extra-packages",
"com.android.systemui",
@@ -904,7 +909,6 @@ android_robolectric_test {
"truth",
],
-
instrumentation_for: "SystemUIRobo-stub",
java_resource_dirs: ["tests/robolectric/config"],
plugins: [
@@ -940,7 +944,6 @@ android_robolectric_test {
"truth",
],
-
instrumentation_for: "SystemUIRobo-stub",
java_resource_dirs: ["tests/robolectric/config"],
plugins: [