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

Commit 40e43094 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Revert "Disable SystemUiRavenTests for now" 

This reverts commit 21f46b9e.

Reason for revert:

The test infra now runs individual ravenwood tests, so now
`SystemUiRavenTests` shouldn't be executed in pre or post-submit, because it's not in any TEST_MAPPINGs.

Previously, the test infra would always execute all ravenwood tests, when it was running any ravenwood test.

Fix: 356666754
Test: atest SystemUiRavenTests
Flag: EXEMPT host test change only
Change-Id: If5e0812b21dda3ae3064c7f88728a9b1aeaff9c0
parent 76b858e0

packages/SystemUI/Android.bp

+31 −30
Original line number Diff line number Diff line
@@ -949,36 +949,37 @@ android_robolectric_test { 
    strict_mode: false,

}



// Disable for now. TODO(b/356666754) Re-enable it

// android_ravenwood_test {

//     name: "SystemUiRavenTests",

//     srcs: [

//         ":SystemUI-tests-utils",

//         ":SystemUI-tests-multivalent",

//         // TODO(b/294256649): pivot to using {.aapt.jar} and re-enable

//         // use_resource_processor: true when better supported by soong

//         ":SystemUIRobo-stub{.aapt.srcjar}",

//     ],

//     static_libs: [

//         "SystemUI-core",

//         "SystemUI-res",

//         "SystemUI-tests-base",

//         "androidx.test.uiautomator_uiautomator",

//         "androidx.core_core-animation-testing",

//         "androidx.test.ext.junit",

//         "kosmos",

//         "mockito-kotlin-nodeps",

//     ],

//     libs: [

//         "android.test.runner",

//         "android.test.base",

//         "android.test.mock",

//     ],

//     auto_gen_config: true,

//     plugins: [

//         "dagger2-compiler",

//     ],

// }

android_ravenwood_test {

    name: "SystemUiRavenTests",

    srcs: [

        ":SystemUI-tests-utils",

        ":SystemUI-tests-multivalent",

        // TODO(b/294256649): pivot to using {.aapt.jar} and re-enable

        // use_resource_processor: true when better supported by soong

        ":SystemUIRobo-stub{.aapt.srcjar}",

    ],

    static_libs: [

        "SystemUI-core",

        "SystemUI-res",

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

        "androidx.test.ext.junit",

        "kosmos",

        "kotlin-test",

        "mockito-kotlin-nodeps",

        "androidx.compose.runtime_runtime",

    ],

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],

    auto_gen_config: true,

    plugins: [

        "dagger2-compiler",

    ],

}



// Opt-out config for optimizing the SystemUI target using R8.

// Disabled via `export SYSTEMUI_OPTIMIZE_JAVA=false`, or explicitly in Make via