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

Commit e0fa880b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Stop using _upstream suffix." into main

parents 6e195b92 a2c208fd

libs/WindowManager/Shell/multivalentTests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ android_app { 
android_robolectric_test {

    name: "WMShellRobolectricTests",

    instrumentation_for: "WindowManagerShellRobolectric",

    upstream: true,

    java_resource_dirs: [

        "robolectric/config",

    ],

packages/CredentialManager/tests/robotests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ android_robolectric_test { 
        "android.test.mock.stubs.system",

        "truth",

    ],

    upstream: true,

    java_resource_dirs: ["config"],

    instrumentation_for: "CredentialManagerRobo",

}

packages/CredentialManager/wear/robotests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -24,6 +24,5 @@ android_robolectric_test { 
        "framework_graphics_flags_java_lib",

    ],

    java_resource_dirs: ["config"],

    upstream: true,

    strict_mode: false,

}

packages/SettingsLib/DataStore/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -25,6 +25,5 @@ android_robolectric_test { 
    java_resource_dirs: ["config"],

    instrumentation_for: "SettingsLibDataStoreShell",

    coverage_libs: ["SettingsLibDataStore"],

    upstream: true,

    strict_mode: false,

}

packages/SettingsLib/Ipc/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ android_library { 
    name: "SettingsLibIpc-testutils",

    srcs: ["testutils/**/*.kt"],

    static_libs: [

        "Robolectric_all-target_upstream",

        "Robolectric_all-target",

        "SettingsLibIpc",

        "androidx.test.core",

        "flag-junit",