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

Commit d311b4a8 authored by John Wu's avatar John Wu Committed by Automerger Merge Worker
Browse files

Merge "[Ravenwood] Move bivalent test into the "test" directory" into main am:... 

Merge "[Ravenwood] Move bivalent test into the "test" directory" into main am: af43c947 am: 99fe029b

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



Change-Id: I8796d5674bc34ae206c8f962033b854c704269e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b211e241 99fe029b

ravenwood/bivalenttest/Android.bp→ravenwood/tests/bivalenttest/Android.bp

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

}



android_test {

    name: "RavenwoodBivalentTest_device",

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



    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,

    },

}
 
// 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,

//     },

// }