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

Commit a502eb6e authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

Merge "Remove sysui soong namespaces" into main

parents 857cd3ff 043f4d0e

packages/SystemUI/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -461,9 +461,9 @@ android_library { 
    resource_dirs: [],

    static_libs: [

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

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/dagger:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/util/settings:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:impl",

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

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

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

        "SystemUI-res",

        "WifiTrackerLib",

        "WindowManager-Shell",
@@ -751,9 +751,9 @@ android_library { 
    ],

    static_libs: [

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

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/dagger:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/util/settings:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:impl",

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

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

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

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

packages/SystemUI/pods/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -20,3 +20,14 @@ package { 
    // specify default_visibility:

    default_visibility: ["//visibility:private"],

}



java_defaults {

    name: "SystemUI_pod_defaults",

    libs: [

        "jsr330",

    ],

    kotlincflags: [

        "-Xjvm-default=all",

    ],

    defaults_visibility: [":__subpackages__"],

}

packages/SystemUI/pods/com/android/systemui/dagger/Android.bp

+3 −6
Original line number Diff line number Diff line
@@ -14,21 +14,18 @@ 
// limitations under the License.

//



soong_namespace {

}



package {

    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],

}



java_library {

    name: "api",

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

    srcs: [

        "**/*.java",

        "**/*.kt",

    ],

    libs: [

        "jsr330",

    defaults: [

        "SystemUI_pod_defaults",

    ],

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

}

packages/SystemUI/pods/com/android/systemui/retail/Android.bp

+7 −8
Original line number Diff line number Diff line
@@ -14,25 +14,24 @@ 
// limitations under the License.

//



soong_namespace {

}



package {

    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],

}



java_library {

    name: "impl",

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

    srcs: ["*.kt"],

    libs: [

        "jsr330",

        "dagger2",

        "SystemUICommon",

        "kotlinx_coroutines",

    ],

    defaults: [

        "SystemUI_pod_defaults",

    ],

    static_libs: [

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/data:impl",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/domain:impl",

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

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

    ],

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

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

}

packages/SystemUI/pods/com/android/systemui/retail/data/Android.bp

+17 −15
Original line number Diff line number Diff line
@@ -14,42 +14,44 @@ 
// limitations under the License.

//



soong_namespace {

}



package {

    default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],

}



java_library {

    name: "api",

    name: "com.android.systemui.retail.data-api",

    srcs: ["repository/*.kt"],

    libs: [

        "kotlinx_coroutines",

    ],

    defaults: [

        "SystemUI_pod_defaults",

    ],

    visibility: [

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/dagger",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/domain",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:__pkg__",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/dagger:__pkg__",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/domain:__pkg__",

    ],

}



java_library {

    name: "impl",

    name: "com.android.systemui.retail.data-impl",

    srcs: ["repository/impl/*.kt"],

    libs: [

        "jsr330",

        "kotlinx_coroutines",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/dagger:api",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/util/settings:api",

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

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

        "SystemUICommon",

    ],

    static_libs: [

        "api",

        "com.android.systemui.retail.data-api",

    ],

    defaults: [

        "SystemUI_pod_defaults",

    ],

    visibility: [

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/dagger",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/domain",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:__pkg__",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/dagger:__pkg__",

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/domain:__pkg__",

    ],

}