diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 19806e7..ade450b 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -60,6 +60,7 @@
         "src-release/**/*.kt",
         "src-release/**/*.java",
     ],
+    path: "src-release",
     visibility: ["//visibility:private"],
 }
 
@@ -69,6 +70,7 @@
         "src-debug/**/*.kt",
         "src-debug/**/*.java",
     ],
+    path: "src-debug",
     visibility: ["//visibility:private"],
 }
 
@@ -430,12 +432,21 @@
     ],
 }
 
-android_library {
-    name: "SystemUI-core",
+filegroup {
+    name: "SystemUI-core-srcs",
     srcs: [
         "src/**/*.kt",
         "src/**/*.java",
         "src/**/I*.aidl",
+    ],
+    path: "src",
+    visibility: ["//visibility:private"],
+}
+
+android_library {
+    name: "SystemUI-core",
+    srcs: [
+        ":SystemUI-core-srcs",
         ":ReleaseJavaFiles",
         "compose/features/src/**/*.kt",
         "compose/facade/enabled/src/**/*.kt",
@@ -731,9 +742,7 @@
     srcs: [
         "tests/src/**/*.kt",
         "tests/src/**/*.java",
-        "src/**/*.kt",
-        "src/**/*.java",
-        "src/**/I*.aidl",
+        ":SystemUI-core-srcs",
         ":ReleaseJavaFiles",
         ":SystemUI-tests-multivalent",
         ":SystemUI-tests-utils",