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

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

Merge "[Ravenwood] Prevent dexmaker from going into Ravenwood tests" into main... 

Merge "[Ravenwood] Prevent dexmaker from going into Ravenwood tests" into main am: 75899a71 am: b4b0be6d

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



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

core/tests/coretests/Android.bp

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

        "androidx.test.ext.junit",

        "androidx.test.uiautomator_uiautomator",

        "compatibility-device-util-axt",

        "compatibility-device-util-axt-ravenwood",

        "flag-junit",

        "platform-test-annotations",

        "flag-junit",

core/tests/utiltests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ android_ravenwood_test { 
        "androidx.annotation_annotation",

        "androidx.test.rules",

        "frameworks-base-testutils",

        "servicestests-utils",

        "servicestests-utils-ravenwood",

    ],

    srcs: [

        "src/android/util/IRemoteMemoryIntArray.aidl",

services/tests/servicestests/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -229,6 +229,20 @@ java_library { 
    ],

}



java_library {

    name: "servicestests-utils-ravenwood",

    srcs: [

        "utils/**/*.java",

        "utils/**/*.kt",

        "utils-mockito/**/*.kt",

    ],

    libs: [

        "android.test.runner.stubs.system",

        "junit",

        "mockito-ravenwood-prebuilt",

    ],

}



java_library {

    name: "mockito-test-utils",

    srcs: [