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

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

Merge "Add back non-ravenzier part of bivalent device side test" into main am:... 

Merge "Add back non-ravenzier part of bivalent device side test" into main am: edf2992f am: 16844470

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



Change-Id: I65be9bef3cb4b71ed9c2d36c2f3e89f2c313b087
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d66ed506 16844470

ravenwood/tests/bivalenttest/Android.bp

+32 −30
Original line number Diff line number Diff line
@@ -54,34 +54,36 @@ android_ravenwood_test { 
    auto_gen_config: true,

}



android_test {

    name: "RavenwoodBivalentTest_device",



    srcs: [

        "test/**/*.java",

    ],

    // TODO(b/371215487): migrate bivalenttest.ravenizer tests to another architecture

    exclude_srcs: [

        "test/**/ravenizer/*.java",

    ],

    static_libs: [

        "junit",

        "truth",



        "androidx.annotation_annotation",

        "androidx.test.ext.junit",

        "androidx.test.rules",



// android_test {

//     name: "RavenwoodBivalentTest_device",

//

//     srcs: [

//         "test/**/*.java",

//     ],

//     static_libs: [

//         "junit",

//         "truth",

//

//         "androidx.annotation_annotation",

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

//         "androidx.test.rules",

//

//         "junit-params",

//         "platform-parametric-runner-lib",

//

//         "ravenwood-junit",

//     ],

//     jni_libs: [

//         "libravenwoodbivalenttest_jni",

//     ],

//     test_suites: [

//         "device-tests",

//     ],

//     optimize: {

//         enabled: false,

//     },

// }
 
        "junit-params",

        "platform-parametric-runner-lib",



        "ravenwood-junit",

    ],

    jni_libs: [

        "libravenwoodbivalenttest_jni",

    ],

    test_suites: [

        "device-tests",

    ],

    optimize: {

        enabled: false,

    },

}