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

Commit eceafc93 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

[conflict] Merge "Move SystemUI test utils to SystemUI/tests/utils/ (1/2)"... 

[conflict] Merge "Move SystemUI test utils to SystemUI/tests/utils/ (1/2)" into tm-qpr-dev am: 735edc27 am: 1f2b9269

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



Change-Id: Ie0186810c4b289811de9824a4a704c6d53c7b56e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8b45dd3 1f2b9269

packages/SystemUI/Android.bp

+6 −20
Original line number Diff line number Diff line
@@ -146,25 +146,10 @@ filegroup { 
filegroup {

    name: "SystemUI-tests-utils",

    srcs: [

        "tests/src/com/android/systemui/SysuiBaseFragmentTest.java",

        "tests/src/com/android/systemui/SysuiTestCase.java",

        "tests/src/com/android/systemui/TestableDependency.java",

        "tests/src/com/android/systemui/classifier/FalsingManagerFake.java",

        "tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java",

        "tests/src/com/android/systemui/statusbar/RankingBuilder.java",

        "tests/src/com/android/systemui/statusbar/SbnBuilder.java",

        "tests/src/com/android/systemui/SysuiTestableContext.java",

        "tests/src/com/android/systemui/util/**/*Fake.java",

        "tests/src/com/android/systemui/utils/leaks/BaseLeakChecker.java",

        "tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java",

        "tests/src/com/android/systemui/**/Fake*.java",

        "tests/src/com/android/systemui/**/Fake*.kt",

        "tests/utils/src/**/*.java",

        "tests/utils/src/**/*.kt",

    ],

    exclude_srcs: [

        "tests/src/com/android/systemui/**/*Test.java",

        "tests/src/com/android/systemui/**/*Test.kt",

    ],

    path: "tests/src",

    path: "tests/utils/src",

}



java_library {
@@ -172,8 +157,8 @@ java_library { 
    srcs: [

        "src/com/android/systemui/util/concurrency/DelayableExecutor.java",

        "src/com/android/systemui/util/time/SystemClock.java",

        "tests/src/com/android/systemui/util/concurrency/FakeExecutor.java",

        "tests/src/com/android/systemui/util/time/FakeSystemClock.java",

        "tests/utils/src/com/android/systemui/util/concurrency/FakeExecutor.java",

        "tests/utils/src/com/android/systemui/util/time/FakeSystemClock.java",

    ],

    jarjar_rules: ":jarjar-rules-shared",

}
@@ -196,6 +181,7 @@ android_library { 
        "src/**/*.java",

        "src/**/I*.aidl",

        ":ReleaseJavaFiles",

        ":SystemUI-tests-utils",

    ],

    static_libs: [

        "WifiTrackerLib",

packages/SystemUI/tests/utils/AndroidManifest.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2022 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.systemui.tests.utils">





</manifest>