[MS08] Move NetworkStats files to f/b/package/ConnectivityT

NetworkStatsService is going to be moved into ConnectivityService
module. Move all related files to packages/ConnectivityT so that
it can be easily migrate these files to connectivity module
after clearing the hidden API usages.

Bug: 197717846
Test: TH
Change-Id: Iead00832b5eb7b1dc40a92027c5a14ae8316b16c
This commit is contained in:
Junyu Lai
2021-12-07 08:25:31 +00:00
parent 96fe4ce495
commit ad166b43df
30 changed files with 98 additions and 6 deletions

View File

@@ -19,11 +19,58 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], 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 { filegroup {
name: "framework-connectivity-nsd-internal-sources", name: "framework-connectivity-nsd-internal-sources",
srcs: [ srcs: [
"src/**/*.java", "src/android/net/nsd/*.aidl",
"src/**/*.aidl", "src/android/net/nsd/*.java",
], ],
path: "src", path: "src",
visibility: [ visibility: [
@@ -34,7 +81,7 @@ filegroup {
filegroup { filegroup {
name: "framework-connectivity-nsd-aidl-export-sources", name: "framework-connectivity-nsd-aidl-export-sources",
srcs: [ srcs: [
"aidl-export/**/*.aidl", "aidl-export/android/net/nsd/*.aidl",
], ],
path: "aidl-export", path: "aidl-export",
visibility: [ visibility: [
@@ -48,6 +95,19 @@ filegroup {
":framework-connectivity-nsd-internal-sources", ":framework-connectivity-nsd-internal-sources",
":framework-connectivity-nsd-aidl-export-sources", ":framework-connectivity-nsd-aidl-export-sources",
], ],
visibility: [
"//visibility:private",
],
}
// Connectivity-T common libraries.
filegroup {
name: "framework-connectivity-tiramisu-sources",
srcs: [
":framework-connectivity-netstats-sources",
":framework-connectivity-nsd-sources",
],
visibility: [ visibility: [
"//frameworks/base", "//frameworks/base",
], ],

View File

@@ -19,10 +19,42 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"], default_applicable_licenses: ["Android-Apache-2.0"],
} }
// NetworkStats related libraries.
filegroup {
name: "services.connectivity-netstats-sources",
srcs: [
"src/com/android/server/net/NetworkIdentity*.java",
"src/com/android/server/net/NetworkStats*.java",
],
path: "src",
visibility: [
"//visibility:private",
],
}
// Nsd related libraries.
filegroup { filegroup {
name: "services.connectivity-nsd-sources", name: "services.connectivity-nsd-sources",
srcs: [ srcs: [
"src/**/*.java", "src/com/android/server/INativeDaemon*.java",
"src/com/android/server/NativeDaemon*.java",
"src/com/android/server/Nsd*.java",
],
path: "src",
visibility: [
"//visibility:private",
],
}
// Connectivity-T common libraries.
filegroup {
name: "services.connectivity-tiramisu-sources",
srcs: [
":services.connectivity-netstats-sources",
":services.connectivity-nsd-sources",
], ],
path: "src", path: "src",
visibility: [ visibility: [