From 892ba98a729008a5e810cf533fee42e58ae1ac42 Mon Sep 17 00:00:00 2001
From: Xiao Ma <xiaom@google.com>
Date: Tue, 15 Mar 2022 08:28:09 +0000
Subject: [PATCH] Remove unused empty filegroups from frameworks/base.

connectivity-tiramisu-sources filegroup in the framework-t and service
folder is useless after moving all source files to updatable-sources
filegroup, delete them from f/b.

Bug: 210586283
Test: m
Merged-In: I2209df4b6f0b4daddc640fc4126ba89601df2c2b
Change-Id: If304e989c668cd816483647a9291968f2f15435d
---
 Android.bp               | 1 -
 services/core/Android.bp | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 8c5a855f944c3..ceb35bd6eb663 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",
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 9d190087e300c..1f440a11d4cb9 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -112,7 +112,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: [
@@ -166,9 +165,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,
 }