Merge "Reorganize NetworkStack common srcs" am: 886e641f32 am: 269580ea0d (ffabd2b0) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ filegroup {
		"apishim/common/*/.java",
		"apishim/29/*/.java",
		"apishim/30/*/.java",
		":net-module-utils-srcs",
		":networkstack-module-utils-srcs",
		],
		}

		@@ -71,7 +71,7 @@ filegroup {
		srcs: [
		"apishim/common/*/.java",
		"apishim/29/*/.java",
		":net-module-utils-srcs",
		":networkstack-module-utils-srcs",
		],
		}

+26 −0

Original line number	Diff line number	Diff line
		@@ -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