diff --git a/Android.bp b/Android.bp
index d2e51fcd2282d..4f1100e128149 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,7 +65,6 @@ filegroup {
         // Java/AIDL sources under frameworks/base
         ":framework-annotations",
         ":framework-blobstore-sources",
-        ":framework-connectivity-tiramisu-sources",
         ":framework-core-sources",
         ":framework-drm-sources",
         ":framework-graphics-nonupdatable-sources",
@@ -271,7 +270,6 @@ java_defaults {
             // Do not add entries to this list.
             ":framework-annotations",
             ":framework-blobstore-sources",
-            ":framework-connectivity-tiramisu-sources",
             ":framework-core-sources",
             ":framework-drm-sources",
             ":framework-graphics-nonupdatable-sources",
diff --git a/services/core/Android.bp b/services/core/Android.bp
index f1b81584f2a70..d84951245ca63 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -120,7 +120,6 @@ java_library_static {
         "java/com/android/server/am/EventLogTags.logtags",
         "java/com/android/server/wm/EventLogTags.logtags",
         "java/com/android/server/policy/EventLogTags.logtags",
-        ":services.connectivity-tiramisu-sources",
     ],
 
     libs: [
@@ -175,9 +174,6 @@ java_library_static {
         "overlayable_policy_aidl-java",
         "SurfaceFlingerProperties",
         "com.android.sysprop.watchdog",
-        // This is used for services.connectivity-tiramisu-sources.
-        // TODO: delete when NetworkStatsService is moved to the mainline module.
-        "net-utils-device-common-bpf",
     ],
     javac_shard_size: 50,
 }