Remove SystemUI Compose build flag (2/4)
This CL removes the build configuration around the SystemUI Compose
build flag as well as all files that were used when the flag was
disabled, now that this flag is enabled by default on all SystemUI
variants.
I will remove the ComposeFacade in a follow-up CL.
Bug: 295304993
Test: mp droid
Flag: N/A
Change-Id: I6294e43c411aeaafb77a59b327ce9c4ead07fc95
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index e63232a..cc2e84c 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -32,55 +32,6 @@
],
}
-// Opt-in configuration for code depending on Jetpack Compose.
-soong_config_module_type {
- name: "systemui_compose_java_defaults",
- module_type: "java_defaults",
- config_namespace: "ANDROID",
- bool_variables: ["SYSTEMUI_USE_COMPOSE"],
- properties: [
- "srcs",
- "static_libs",
- ],
-}
-
-systemui_compose_java_defaults {
- name: "SystemUI_compose_defaults",
- soong_config_variables: {
- SYSTEMUI_USE_COMPOSE: {
- // Because files in compose/features/ depend on SystemUI
- // code, we compile those files when compiling SystemUI-core.
- // We also compile the ComposeFacade in
- // compose/facade/enabled/.
- srcs: [
- "compose/features/src/**/*.kt",
- "compose/facade/enabled/src/**/*.kt",
- ],
-
- // The dependencies needed by SystemUIComposeFeatures,
- // except for SystemUI-core.
- // Copied from compose/features/Android.bp.
- static_libs: [
- "PlatformComposeCore",
- "PlatformComposeSceneTransitionLayout",
-
- "androidx.compose.runtime_runtime",
- "androidx.compose.material3_material3",
- "androidx.compose.material_material-icons-extended",
- "androidx.activity_activity-compose",
- "androidx.compose.animation_animation-graphics",
- ],
-
- // By default, Compose is disabled and we compile the ComposeFacade
- // in compose/facade/disabled/.
- conditions_default: {
- srcs: ["compose/facade/disabled/src/**/*.kt"],
- static_libs: [],
- },
- },
- },
-}
-
java_library {
name: "SystemUI-proto",
@@ -138,14 +89,13 @@
android_library {
name: "SystemUI-core",
- defaults: [
- "SystemUI_compose_defaults",
- ],
srcs: [
"src/**/*.kt",
"src/**/*.java",
"src/**/I*.aidl",
":ReleaseJavaFiles",
+ "compose/features/src/**/*.kt",
+ "compose/facade/enabled/src/**/*.kt",
],
product_variables: {
debuggable: {
@@ -207,6 +157,13 @@
"LowLightDreamLib",
"motion_tool_lib",
"notification_flags_lib",
+ "PlatformComposeCore",
+ "PlatformComposeSceneTransitionLayout",
+ "androidx.compose.runtime_runtime",
+ "androidx.compose.material3_material3",
+ "androidx.compose.material_material-icons-extended",
+ "androidx.activity_activity-compose",
+ "androidx.compose.animation_animation-graphics",
],
libs: [
"keepanno-annotations",
@@ -337,15 +294,19 @@
"ravenwood-junit",
"platform-test-annotations",
"notification_flags_lib",
+ "PlatformComposeCore",
+ "PlatformComposeSceneTransitionLayout",
+ "androidx.compose.runtime_runtime",
+ "androidx.compose.material3_material3",
+ "androidx.compose.material_material-icons-extended",
+ "androidx.activity_activity-compose",
+ "androidx.compose.animation_animation-graphics",
],
}
android_library {
name: "SystemUI-tests",
use_resource_processor: true,
- defaults: [
- "SystemUI_compose_defaults",
- ],
manifest: "tests/AndroidManifest-base.xml",
additional_manifests: ["tests/AndroidManifest.xml"],
srcs: [
@@ -357,6 +318,8 @@
":ReleaseJavaFiles",
":SystemUI-tests-multivalent",
":SystemUI-tests-utils",
+ "compose/features/src/**/*.kt",
+ "compose/facade/enabled/src/**/*.kt",
],
static_libs: [
"SystemUI-tests-base",
@@ -367,6 +330,7 @@
"androidx.test.ext.truth",
"kotlin-test",
"SystemUICustomizationTestUtils",
+ "androidx.compose.runtime_runtime",
],
libs: [
"android.test.runner",
@@ -396,7 +360,6 @@
defaults: [
"platform_app_defaults",
"SystemUI_optimized_defaults",
- "SystemUI_compose_defaults",
],
manifest: "tests/AndroidManifest-base.xml",
@@ -405,9 +368,12 @@
"src/**/*.java",
"src/**/I*.aidl",
":ReleaseJavaFiles",
+ "compose/features/src/**/*.kt",
+ "compose/facade/enabled/src/**/*.kt",
],
static_libs: [
"SystemUI-tests-base",
+ "androidx.compose.runtime_runtime",
],
libs: [
"keepanno-annotations",