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

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

Merge "Make the current.txt available for use by the /vendor tests" into main... 

Merge "Make the current.txt available for use by the /vendor tests" into main am: f164d10b am: 61628e80

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



Change-Id: Icf8b56f931f0e5e5e37270569cff272a3d9ed8a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e33eea9d 61628e80

test-base/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -120,12 +120,13 @@ filegroup { 
    path: "src",

    path: "src",

}

}





// Make the current.txt available for use by the cts/tests/signature tests.

// Make the current.txt available for use by the cts/tests/signature and /vendor tests.

// ========================================================================

// ========================================================================

filegroup {

filegroup {

    name: "android-test-base-current.txt",

    name: "android-test-base-current.txt",

    visibility: [

    visibility: [

        "//cts/tests/signature/api",

        "//cts/tests/signature/api",

        "//vendor:__subpackages__",

    ],

    ],

    srcs: [

    srcs: [

        "api/current.txt",

        "api/current.txt",

test-runner/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -79,12 +79,13 @@ java_library { 
    ],

    ],

}

}





// Make the current.txt available for use by the cts/tests/signature tests.

// Make the current.txt available for use by the cts/tests/signature and /vendor tests.

// ========================================================================

// ========================================================================

filegroup {

filegroup {

    name: "android-test-runner-current.txt",

    name: "android-test-runner-current.txt",

    visibility: [

    visibility: [

        "//cts/tests/signature/api",

        "//cts/tests/signature/api",

        "//vendor:__subpackages__",

    ],

    ],

    srcs: [

    srcs: [

        "api/current.txt",

        "api/current.txt",