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

Commit b06310a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up obsolete aliases for Truth." into main am: 4b0bf8f9 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776829



Change-Id: Id02586892e1b22d8450098323183c1ad33ca8574
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12c10132 4b0bf8f9

tests/anomaly-tester/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ android_test { 
        "androidx.test.rules",

        "mockito-target",

        "androidx.test.uiautomator_uiautomator",

        "truth-prebuilt",

        "truth",

    ],



    srcs: ["**/*.java"],

tests/componenttests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ android_test { 
    ],



    static_libs: [

        "truth-prebuilt",

        "truth",

        "androidx.test.core",

        "androidx.test.espresso.core",

        "androidx.test.espresso.intents-nodeps",

tests/robotests/Android.bp

+7 −4
Original line number Diff line number Diff line
@@ -90,7 +90,10 @@ android_robolectric_test { 
        "ims-common",

    ],



    java_resource_dirs: ["config", "resources"],

    java_resource_dirs: [

        "config",

        "resources",

    ],



    instrumentation_for: "SettingsRoboTestStub",
@@ -114,6 +117,6 @@ java_library { 
        "Settings-core",

        "Robolectric_all-target",

        "mockito-robolectric-prebuilt",

        "truth-prebuilt",

        "truth",

    ],

}

tests/uitests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ android_test { 
        "settings-helper",

        "sysui-helper",

        "timeresult-helper-lib",

        "truth-prebuilt",

        "truth",

    ],



    //sdk_version: "current",

tests/unit/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ android_test { 
        "androidx.preference_preference",

        "mockito-target-minus-junit4",

        "platform-test-annotations",

        "truth-prebuilt",

        "truth",

        "androidx.test.uiautomator_uiautomator",

        // Don't add SettingsLib libraries here - you can use them directly as they are in the

        // instrumented Settings app.

    ],



    errorprone: {

        javacflags: ["-Xep:CheckReturnValue:WARN"]

        javacflags: ["-Xep:CheckReturnValue:WARN"],

    },



    // Include all test java files.