diff --git a/framework-t/Sources.bp b/framework-t/Sources.bp
index 2363a9f..9c07f39 100644
--- a/framework-t/Sources.bp
+++ b/framework-t/Sources.bp
@@ -19,11 +19,58 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+// NetworkStats related libraries.
+
+filegroup {
+    name: "framework-connectivity-netstats-internal-sources",
+    srcs: [
+        "src/android/app/usage/*.java",
+        "src/android/net/DataUsage*.*",
+        "src/android/net/INetworkStats*.*",
+        "src/android/net/NetworkIdentity*.java",
+        "src/android/net/NetworkStateSnapshot.*",
+        "src/android/net/NetworkStats*.*",
+        "src/android/net/NetworkTemplate.*",
+        "src/android/net/TrafficStats.java",
+        "src/android/net/UnderlyingNetworkInfo.*",
+        "src/android/net/netstats/**/*.*",
+    ],
+    path: "src",
+    visibility: [
+        "//visibility:private",
+    ],
+}
+
+filegroup {
+    name: "framework-connectivity-netstats-aidl-export-sources",
+    srcs: [
+        "aidl-export/android/net/NetworkStats.aidl",
+        "aidl-export/android/net/NetworkTemplate.aidl",
+    ],
+    path: "aidl-export",
+    visibility: [
+        "//visibility:private",
+    ],
+}
+
+filegroup {
+    name: "framework-connectivity-netstats-sources",
+    srcs: [
+        ":framework-connectivity-netstats-internal-sources",
+        ":framework-connectivity-netstats-aidl-export-sources",
+    ],
+    visibility: [
+        "//visibility:private",
+    ],
+}
+
+// Nsd related libraries.
+
 filegroup {
     name: "framework-connectivity-nsd-internal-sources",
     srcs: [
-        "src/**/*.java",
-        "src/**/*.aidl",
+        "src/android/net/nsd/*.aidl",
+        "src/android/net/nsd/*.java",
     ],
     path: "src",
     visibility: [
@@ -34,7 +81,7 @@
 filegroup {
     name: "framework-connectivity-nsd-aidl-export-sources",
     srcs: [
-        "aidl-export/**/*.aidl",
+        "aidl-export/android/net/nsd/*.aidl",
     ],
     path: "aidl-export",
     visibility: [
@@ -49,6 +96,19 @@
         ":framework-connectivity-nsd-aidl-export-sources",
     ],
     visibility: [
-        "//frameworks/base",
+        "//visibility:private",
     ],
 }
+
+// Connectivity-T common libraries.
+
+filegroup {
+    name: "framework-connectivity-tiramisu-sources",
+    srcs: [
+        ":framework-connectivity-netstats-sources",
+        ":framework-connectivity-nsd-sources",
+    ],
+    visibility: [
+        "//frameworks/base",
+    ],
+}
\ No newline at end of file