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

Commit dd2a9044 authored by Mike Schneider's avatar Mike Schneider
Browse files

Make mechanics tests depend on mechanics lib directly 

Bug: 240432457
Test: atest mechanics_tests
Flag: EXEMPT build config clean up
Change-Id: Icd61a6e1ecb232eed7c88ffc3e25d62d61ef5820
parent 94691748

mechanics/Android.bp

+1 −8
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

    name: "mechanics-srcs",

    srcs: [

        "src/**/*.kt",

    ],

}



android_library {

    name: "mechanics",

    manifest: "AndroidManifest.xml",
@@ -36,7 +29,7 @@ android_library { 
        "androidx.compose.foundation_foundation-layout",

    ],

    srcs: [

        ":mechanics-srcs",

        "src/**/*.kt",

    ],

    kotlincflags: ["-Xjvm-default=all"],

}

mechanics/tests/Android.bp

+6 −11
Original line number Diff line number Diff line
@@ -25,23 +25,15 @@ android_test { 


    srcs: [

        "src/**/*.kt",



        // TODO(b/240432457): Depend on mechanics directly

        ":mechanics-srcs",

    ],



    static_libs: [

        // ":mechanics" dependencies

        "androidx.compose.runtime_runtime",

        "androidx.compose.material3_material3",

        "androidx.compose.ui_ui-util",

        "androidx.compose.foundation_foundation-layout",



        // ":mechanics_tests" dependencies

        "//frameworks/libs/systemui/mechanics:mechanics",

        "//frameworks/libs/systemui/mechanics:mechanics-testing",

        "androidx.compose.animation_animation-core",

        "platform-test-annotations",

        "PlatformMotionTestingCompose",

        "androidx.compose.runtime_runtime",

        "androidx.compose.animation_animation-core",

        "androidx.compose.ui_ui-test-junit4",

        "androidx.compose.ui_ui-test-manifest",

        "androidx.test.runner",
@@ -50,6 +42,9 @@ android_test { 
        "testables",

        "truth",

    ],

    associates: [

        "mechanics",

    ],

    asset_dirs: ["goldens"],

    kotlincflags: ["-Xjvm-default=all"],

}