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

Commit 46d15f86 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Add bindingGraphFix flag for Dagger." into main am: 7d5b30c1 am: 142a9e0f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3445832



Change-Id: Ib2293c179d8b6ae03642cbbf99ecfd7300dc4cbf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b7d92aa 142a9e0f

packages/SystemUI/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -531,6 +531,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"],
@@ -757,6 +758,10 @@ android_library { 
        // TODO(b/352363800): Why do we need this?

        "-J-Xmx8192M",

    ],

    javacflags: [

        "-Adagger.useBindingGraphFix=ENABLED",

    ],



    aaptflags: [

        "--extra-packages",

        "com.android.systemui",
@@ -847,7 +852,6 @@ android_robolectric_test { 
        "androidx.test.ext.truth",

    ],





    instrumentation_for: "SystemUIRobo-stub",

    java_resource_dirs: ["tests/robolectric/config"],

    plugins: [
@@ -884,7 +888,6 @@ android_robolectric_test { 
        "androidx.test.ext.truth",

    ],





    instrumentation_for: "SystemUIRobo-stub",

    java_resource_dirs: ["tests/robolectric/config"],

    plugins: [