Merge "Move IpSec associated files to f/b/packages/ConnectivityT" am: 58093bfdec

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909906

Change-Id: I59706c5e4c6c24764153cd6b9609d4b8b27a357d
This commit is contained in:
Treehugger Robot
2021-12-14 08:47:46 +00:00
committed by Automerger Merge Worker
18 changed files with 34 additions and 8 deletions

View File

@@ -1 +1,2 @@
file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking
per-file **IpSec* = file:/services/core/java/com/android/server/vcn/OWNERS

View File

@@ -100,6 +100,20 @@ filegroup {
], ],
} }
// IpSec related libraries.
filegroup {
name: "framework-connectivity-ipsec-sources",
srcs: [
"src/android/net/IIpSecService.aidl",
"src/android/net/IpSec*.*",
],
path: "src",
visibility: [
"//visibility:private",
],
}
// Connectivity-T common libraries. // Connectivity-T common libraries.
filegroup { filegroup {
@@ -116,11 +130,10 @@ filegroup {
filegroup { filegroup {
name: "framework-connectivity-tiramisu-sources", name: "framework-connectivity-tiramisu-sources",
srcs: [ srcs: [
":framework-connectivity-ipsec-sources",
":framework-connectivity-netstats-sources", ":framework-connectivity-netstats-sources",
":framework-connectivity-nsd-sources", ":framework-connectivity-nsd-sources",
":framework-connectivity-tiramisu-internal-sources", ":framework-connectivity-tiramisu-internal-sources",
], ],
visibility: [ visibility: ["//frameworks/base"],
"//frameworks/base",
],
} }

View File

@@ -48,16 +48,28 @@ filegroup {
], ],
} }
// IpSec related libraries.
filegroup {
name: "services.connectivity-ipsec-sources",
srcs: [
"src/com/android/server/IpSecService.java",
],
path: "src",
visibility: [
"//visibility:private",
],
}
// Connectivity-T common libraries. // Connectivity-T common libraries.
filegroup { filegroup {
name: "services.connectivity-tiramisu-sources", name: "services.connectivity-tiramisu-sources",
srcs: [ srcs: [
":services.connectivity-ipsec-sources",
":services.connectivity-netstats-sources", ":services.connectivity-netstats-sources",
":services.connectivity-nsd-sources", ":services.connectivity-nsd-sources",
], ],
path: "src", path: "src",
visibility: [ visibility: ["//frameworks/base/services/core"],
"//frameworks/base/services/core",
],
} }