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

Commit 25591093 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "caitlinshk-pod-time" into main 

* changes:
  [Pod] Move SystemClock to util.time pod.
  [Pod] Remove srcs from pods default rule.
parents 2390cd95 a3203bce

packages/SystemUI/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ java_library { 
    name: "SystemUI-tests-concurrency",

    srcs: [

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

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

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

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

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

    ],
@@ -788,9 +788,7 @@ android_library { 
    ],

    static_libs: [

        "//frameworks/libs/systemui:compilelib",

        "com.android.systemui.dagger-api",

        "com.android.systemui.util.settings-api",

        "com.android.systemui.retail-impl",

        "com.android.systemui.pods-aosp-handheld",

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

packages/SystemUI/pods/Android.bp

+3 −8
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ package { 


java_defaults {

    name: "SystemUI_pod_defaults_api",

    srcs: [

        "*.java",

        "*.kt",

    ],

    libs: [

        "jsr330",

    ],
@@ -44,10 +40,6 @@ java_defaults { 


java_defaults {

    name: "SystemUI_pod_defaults_impl",

    srcs: [

        "impl/*.java",

        "impl/*.kt",

    ],

    libs: [

        "jsr330",

    ],
@@ -72,6 +64,9 @@ java_library { 
        "com.android.systemui.dagger-api",

        "com.android.systemui.retail-impl",

        "com.android.systemui.util.settings-api",

        "com.android.systemui.util.time-api",

        "com.android.systemui.util.time-impl",



    ],

    visibility: ["//frameworks/base/packages/SystemUI:__pkg__"],

}

packages/SystemUI/pods/com/android/systemui/util/settings/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ package { 


java_library {

    name: "com.android.systemui.util.settings-api",

    srcs: [

        "*.java",

        "*.kt",

    ],

    libs: [

        "//frameworks/libs/systemui:tracinglib-platform",

        "com.android.systemui.dagger-api",

packages/SystemUI/pods/com/android/systemui/util/time/Android.bp

0 → 100644
+48 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2025 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.

//



package {

    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],

}



java_library {

    name: "com.android.systemui.util.time-api",

    srcs: [

        "*.java",

        "*.kt",

    ],

    defaults: [

        "SystemUI_pod_defaults_api",

    ],

}



java_library {

    name: "com.android.systemui.util.time-impl",

    srcs: [

        "impl/*.java",

        "impl/*.kt",

    ],

    libs: [

        "com.android.systemui.dagger-api",

        "dagger2",

    ],

    static_libs: [

        "com.android.systemui.util.time-api",

    ],

    defaults: [

        "SystemUI_pod_defaults_impl",

    ],

}