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

Commit 35c1313f authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Make STL tests depend on STL lib directly 

Bug: 240432457
Test: atest PlatformComposeSceneTransitionLayoutTests
Flag: EXEMPT build config clean up
Change-Id: Ia1a4856974fc670d3b7fbaad5d5053048c22416a
parent 3cd0d4fe

packages/SystemUI/compose/scene/Android.bp

+1 −8
Original line number Diff line number Diff line
@@ -22,19 +22,12 @@ package { 
    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],

}



filegroup {

    name: "PlatformComposeSceneTransitionLayout-srcs",

    srcs: [

        "src/**/*.kt",

    ],

}



android_library {

    name: "PlatformComposeSceneTransitionLayout",

    manifest: "AndroidManifest.xml",



    srcs: [

        ":PlatformComposeSceneTransitionLayout-srcs",

        "src/**/*.kt",

    ],



    static_libs: [

packages/SystemUI/compose/scene/tests/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -30,14 +30,11 @@ android_test { 


    srcs: [

        "src/**/*.kt",



        // TODO(b/240432457): Depend on PlatformComposeSceneTransitionLayout

        // directly once Kotlin tests can access internal declarations.

        ":PlatformComposeSceneTransitionLayout-srcs",

    ],



    static_libs: [

        "platform-test-annotations",

        "PlatformComposeSceneTransitionLayout",

        "PlatformComposeSceneTransitionLayoutTestsUtils",

        "PlatformMotionTestingCompose",

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


        "truth",

    ],

    associates: [

        "PlatformComposeSceneTransitionLayout",

    ],

    asset_dirs: ["goldens"],

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

    use_resource_processor: true,