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

Commit 45e8f761 authored by Ronish Kalia's avatar Ronish Kalia Committed by Automerger Merge Worker
Browse files

Merge "Migrate Test Targets to New Android Ownership Model" into main am: 02fe034c am: d6cc17f6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/2945332



Change-Id: Ibbefb7513acca85cd33bdf78a4b57091613d16a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 463d5b79 d6cc17f6

animationlib/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_motion",

    default_applicable_licenses: ["Android-Apache-2.0"],

}

motiontoollib/Android.bp

+7 −7
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_motion",

    default_applicable_licenses: ["Android-Apache-2.0"],

}
@@ -22,10 +23,10 @@ java_library { 
    proto: {

        type: "lite",

        local_include_dirs: [

            "src/com/android/app/motiontool/proto"

            "src/com/android/app/motiontool/proto",

        ],

        include_dirs: [

            "frameworks/libs/systemui/viewcapturelib/src/com/android/app/viewcapture/proto"

            "frameworks/libs/systemui/viewcapturelib/src/com/android/app/viewcapture/proto",

        ],

    },

    static_libs: [
@@ -49,7 +50,7 @@ android_library { 


    srcs: [

        "src/**/*.java",

        "src/**/*.kt"

        "src/**/*.kt",

    ],

}
@@ -65,11 +66,11 @@ android_test { 
        "motion_tool_proto",

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "testables"

        "testables",

    ],

    srcs: [

        "**/*.java",

        "**/*.kt"

        "**/*.kt",

    ],

    libs: [

        "android.test.runner",
@@ -77,4 +78,3 @@ android_test { 
    ],

    test_suites: ["device-tests"],

}

viewcapturelib/Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_launcher",

    default_applicable_licenses: ["Android-Apache-2.0"],

}
@@ -22,7 +23,7 @@ java_library { 
    proto: {

        type: "lite",

        local_include_dirs: [

            "src/com/android/app/viewcapture/proto"

            "src/com/android/app/viewcapture/proto",

        ],

    },

    static_libs: ["libprotobuf-java-lite"],
@@ -42,7 +43,7 @@ android_library { 


    srcs: [

        "src/**/*.java",

        "src/**/*.kt"

        "src/**/*.kt",

    ],

}
@@ -62,7 +63,7 @@ android_test { 
    ],

    srcs: [

        "**/*.java",

        "**/*.kt"

        "**/*.kt",

    ],

    libs: [

        "android.test.runner",