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

Commit 72e31a76 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Pod] Split pod defaults into `_api` and `_impl` versions. 

Bug: 307607958
Flag: EXEMPT refactor
Test: m SystemUI-core
Change-Id: I70e6cc7bb28b20e35a21984376712d35d0bcd8c0
parent d1ca03fe

packages/SystemUI/pods/Android.bp

+29 −1
Original line number Diff line number Diff line
@@ -22,7 +22,32 @@ package { 
}



java_defaults {

    name: "SystemUI_pod_defaults",

    name: "SystemUI_pod_defaults_api",

    srcs: [

        "*.java",

        "*.kt",

    ],

    libs: [

        "jsr330",

    ],

    lint: {

        extra_check_modules: ["SystemUILintChecker"],

        warning_checks: ["MissingApacheLicenseDetector"],

    },

    kotlincflags: [

        "-Xexplicit-api=strict",

        "-Xjvm-default=all",

    ],

    visibility: ["//visibility:public"],

    defaults_visibility: [":__subpackages__"],

}



java_defaults {

    name: "SystemUI_pod_defaults_impl",

    srcs: [

        "impl/*.java",

        "impl/*.kt",

    ],

    libs: [

        "jsr330",

    ],
@@ -34,6 +59,9 @@ java_defaults { 
        "-Xexplicit-api=strict",

        "-Xjvm-default=all",

    ],

    // TODO(b/423659894): Once SysUI stands up its Dagger graph in its own build target, this

    // visibility should be updated to just that build target.

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

    defaults_visibility: [":__subpackages__"],

}

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

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ java_library { 
        "**/*.kt",

    ],

    defaults: [

        "SystemUI_pod_defaults",

        "SystemUI_pod_defaults_api",

    ],

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

}

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

+1 −2
Original line number Diff line number Diff line
@@ -27,11 +27,10 @@ java_library { 
        "kotlinx_coroutines",

    ],

    defaults: [

        "SystemUI_pod_defaults",

        "SystemUI_pod_defaults_impl",

    ],

    static_libs: [

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

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

    ],

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

}

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

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ java_library { 
        "kotlinx_coroutines",

    ],

    defaults: [

        "SystemUI_pod_defaults",

        "SystemUI_pod_defaults_api",

    ],

    visibility: [

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:__pkg__",
@@ -46,7 +46,7 @@ java_library { 
        "com.android.systemui.retail.data-api",

    ],

    defaults: [

        "SystemUI_pod_defaults",

        "SystemUI_pod_defaults_impl",

    ],

    visibility: [

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

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ java_library { 
    name: "com.android.systemui.retail.domain-api",

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

    defaults: [

        "SystemUI_pod_defaults",

        "SystemUI_pod_defaults_api",

    ],

    visibility: [

        "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:__pkg__",
@@ -40,7 +40,7 @@ java_library { 
        "com.android.systemui.retail.domain-api",

    ],

    defaults: [

        "SystemUI_pod_defaults",

        "SystemUI_pod_defaults_impl",

    ],

    visibility: [

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