Reorganize NetworkStack common srcs
This specifies the exact set of files in NetworkStack that are used in
frameworks/base/services/net. It will allow us to add other files to the
directory without exposing them to services/net (which would make it
harder to remove all services.net dependencies on NetworkStack).
Test: m
Change-Id: I6abee79523d04c0c3f9ed3e96b1dd9cb37dc4cc3
diff --git a/common/moduleutils/Android.bp b/common/moduleutils/Android.bp
index afd82e5..4b2a4b8 100644
--- a/common/moduleutils/Android.bp
+++ b/common/moduleutils/Android.bp
@@ -15,9 +15,35 @@
//
// Shared utility sources to be used by multiple network modules
+// TODO: remove all frameworks/base dependencies on packages/modules/NetworkStack and
+// frameworks/base/packages/Tethering by moving these files to frameworks/libs/net.
filegroup {
name: "net-module-utils-srcs",
+ srcs: [
+ "src/android/net/util/SharedLog.java",
+ "src/android/net/shared/InitialConfiguration.java",
+ "src/android/net/shared/IpConfigurationParcelableUtil.java",
+ "src/android/net/shared/LinkPropertiesParcelableUtil.java",
+ "src/android/net/shared/ParcelableUtil.java",
+ "src/android/net/shared/NetdUtils.java",
+ "src/android/net/shared/NetworkMonitorUtils.java",
+ "src/android/net/shared/ParcelableUtil.java",
+ "src/android/net/shared/PrivateDnsConfig.java",
+ "src/android/net/shared/ProvisioningConfiguration.java",
+ "src/android/net/shared/RouteUtils.java",
+ "src/android/net/util/InterfaceParams.java",
+ ],
+ visibility: [
+ "//frameworks/base/services/net",
+ ]
+}
+
+filegroup {
+ name: "networkstack-module-utils-srcs",
srcs: ["src/**/*.java"],
+ visibility: [
+ "//packages/modules/NetworkStack",
+ ]
}
// Shared utility sources to be used by tethering modules