Remove sysui soong namespaces
Also, add java_defaults for configuring sysui pods
Test: m, flashall
Bug: 307607958
Flag: EXEMPT build change is a no-op
Change-Id: I33daf96532ad1e009a64fbb666126479dd9d2464
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 49cdec1..b53cb27 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -461,9 +461,9 @@
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 @@
],
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",
diff --git a/packages/SystemUI/pods/Android.bp b/packages/SystemUI/pods/Android.bp
index e45f317..588a074 100644
--- a/packages/SystemUI/pods/Android.bp
+++ b/packages/SystemUI/pods/Android.bp
@@ -20,3 +20,14 @@
// specify default_visibility:
default_visibility: ["//visibility:private"],
}
+
+java_defaults {
+ name: "SystemUI_pod_defaults",
+ libs: [
+ "jsr330",
+ ],
+ kotlincflags: [
+ "-Xjvm-default=all",
+ ],
+ defaults_visibility: [":__subpackages__"],
+}
diff --git a/packages/SystemUI/pods/com/android/systemui/dagger/Android.bp b/packages/SystemUI/pods/com/android/systemui/dagger/Android.bp
index df90be8..72c41bb 100644
--- a/packages/SystemUI/pods/com/android/systemui/dagger/Android.bp
+++ b/packages/SystemUI/pods/com/android/systemui/dagger/Android.bp
@@ -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__"],
}
diff --git a/packages/SystemUI/pods/com/android/systemui/retail/Android.bp b/packages/SystemUI/pods/com/android/systemui/retail/Android.bp
index f047848..639eae9 100644
--- a/packages/SystemUI/pods/com/android/systemui/retail/Android.bp
+++ b/packages/SystemUI/pods/com/android/systemui/retail/Android.bp
@@ -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",
],
- static_libs: [
- "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/data:impl",
- "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/domain:impl",
+ defaults: [
+ "SystemUI_pod_defaults",
],
- visibility: ["//frameworks/base/packages/SystemUI"],
+ static_libs: [
+ "com.android.systemui.retail.data-impl",
+ "com.android.systemui.retail.domain-impl",
+ ],
+ visibility: ["//frameworks/base/packages/SystemUI:__pkg__"],
}
diff --git a/packages/SystemUI/pods/com/android/systemui/retail/data/Android.bp b/packages/SystemUI/pods/com/android/systemui/retail/data/Android.bp
index f148a7c..1aa41e4 100644
--- a/packages/SystemUI/pods/com/android/systemui/retail/data/Android.bp
+++ b/packages/SystemUI/pods/com/android/systemui/retail/data/Android.bp
@@ -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__",
],
}
diff --git a/packages/SystemUI/pods/com/android/systemui/retail/domain/Android.bp b/packages/SystemUI/pods/com/android/systemui/retail/domain/Android.bp
index 787861c..64b0e22 100644
--- a/packages/SystemUI/pods/com/android/systemui/retail/domain/Android.bp
+++ b/packages/SystemUI/pods/com/android/systemui/retail/domain/Android.bp
@@ -14,33 +14,35 @@
// limitations under the License.
//
-soong_namespace {
-}
-
package {
default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],
}
java_library {
- name: "api",
+ name: "com.android.systemui.retail.domain-api",
srcs: ["interactor/*.kt"],
+ defaults: [
+ "SystemUI_pod_defaults",
+ ],
visibility: [
- "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail",
+ "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:__pkg__",
],
}
java_library {
- name: "impl",
+ name: "com.android.systemui.retail.domain-impl",
srcs: ["interactor/impl/*.kt"],
libs: [
- "jsr330",
- "//frameworks/base/packages/SystemUI/pods/com/android/systemui/dagger:api",
- "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail/data:api",
+ "com.android.systemui.dagger-api",
+ "com.android.systemui.retail.data-api",
],
static_libs: [
- "api",
+ "com.android.systemui.retail.domain-api",
+ ],
+ defaults: [
+ "SystemUI_pod_defaults",
],
visibility: [
- "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail",
+ "//frameworks/base/packages/SystemUI/pods/com/android/systemui/retail:__pkg__",
],
}
diff --git a/packages/SystemUI/pods/com/android/systemui/util/settings/Android.bp b/packages/SystemUI/pods/com/android/systemui/util/settings/Android.bp
index 1aa7729..d97ff13 100644
--- a/packages/SystemUI/pods/com/android/systemui/util/settings/Android.bp
+++ b/packages/SystemUI/pods/com/android/systemui/util/settings/Android.bp
@@ -14,27 +14,25 @@
// limitations under the License.
//
-soong_namespace {
-}
-
package {
default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],
}
java_library {
- name: "api",
+ name: "com.android.systemui.util.settings-api",
srcs: [
"*.java",
"*.kt",
],
libs: [
"//frameworks/libs/systemui:tracinglib-platform",
- "//frameworks/base/packages/SystemUI/pods/com/android/systemui/dagger:api",
+ "com.android.systemui.dagger-api",
"SystemUICommon",
"androidx.annotation_annotation",
"kotlinx_coroutines_android",
- "jsr330",
],
- kotlincflags: ["-Xjvm-default=all"],
+ defaults: [
+ "SystemUI_pod_defaults",
+ ],
visibility: ["//frameworks/base/packages/SystemUI:__subpackages__"],
}