diff options
18 files changed, 34 insertions, 8 deletions
diff --git a/packages/ConnectivityT/OWNERS b/packages/ConnectivityT/OWNERS index 4862377852ac..e267d19ad7e2 100644 --- a/packages/ConnectivityT/OWNERS +++ b/packages/ConnectivityT/OWNERS @@ -1 +1,2 @@ -file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking
\ No newline at end of file +file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking +per-file **IpSec* = file:/services/core/java/com/android/server/vcn/OWNERS diff --git a/packages/ConnectivityT/framework-t/Android.bp b/packages/ConnectivityT/framework-t/Android.bp index 3e82b28ce67e..931a55b27ddb 100644 --- a/packages/ConnectivityT/framework-t/Android.bp +++ b/packages/ConnectivityT/framework-t/Android.bp @@ -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. filegroup { @@ -116,11 +130,10 @@ filegroup { filegroup { name: "framework-connectivity-tiramisu-sources", srcs: [ + ":framework-connectivity-ipsec-sources", ":framework-connectivity-netstats-sources", ":framework-connectivity-nsd-sources", ":framework-connectivity-tiramisu-internal-sources", ], - visibility: [ - "//frameworks/base", - ], + visibility: ["//frameworks/base"], } diff --git a/core/java/android/net/IIpSecService.aidl b/packages/ConnectivityT/framework-t/src/android/net/IIpSecService.aidl index 933256a3b475..933256a3b475 100644 --- a/core/java/android/net/IIpSecService.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IIpSecService.aidl diff --git a/core/java/android/net/IpSecAlgorithm.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecAlgorithm.java index 86052484eaf6..86052484eaf6 100644 --- a/core/java/android/net/IpSecAlgorithm.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecAlgorithm.java diff --git a/core/java/android/net/IpSecConfig.aidl b/packages/ConnectivityT/framework-t/src/android/net/IpSecConfig.aidl index eaefca74d3a0..eaefca74d3a0 100644 --- a/core/java/android/net/IpSecConfig.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecConfig.aidl diff --git a/core/java/android/net/IpSecConfig.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecConfig.java index 575c5ed968f8..575c5ed968f8 100644 --- a/core/java/android/net/IpSecConfig.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecConfig.java diff --git a/core/java/android/net/IpSecManager.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java index c10680761ff1..c10680761ff1 100644 --- a/core/java/android/net/IpSecManager.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java diff --git a/core/java/android/net/IpSecSpiResponse.aidl b/packages/ConnectivityT/framework-t/src/android/net/IpSecSpiResponse.aidl index 6484a0013c53..6484a0013c53 100644 --- a/core/java/android/net/IpSecSpiResponse.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecSpiResponse.aidl diff --git a/core/java/android/net/IpSecSpiResponse.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecSpiResponse.java index f99e570fb761..f99e570fb761 100644 --- a/core/java/android/net/IpSecSpiResponse.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecSpiResponse.java diff --git a/core/java/android/net/IpSecTransform.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecTransform.java index b48c1fdaf1b2..b48c1fdaf1b2 100644 --- a/core/java/android/net/IpSecTransform.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecTransform.java diff --git a/core/java/android/net/IpSecTransformResponse.aidl b/packages/ConnectivityT/framework-t/src/android/net/IpSecTransformResponse.aidl index 546230d5b888..546230d5b888 100644 --- a/core/java/android/net/IpSecTransformResponse.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecTransformResponse.aidl diff --git a/core/java/android/net/IpSecTransformResponse.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecTransformResponse.java index a38488954fc0..a38488954fc0 100644 --- a/core/java/android/net/IpSecTransformResponse.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecTransformResponse.java diff --git a/core/java/android/net/IpSecTunnelInterfaceResponse.aidl b/packages/ConnectivityT/framework-t/src/android/net/IpSecTunnelInterfaceResponse.aidl index 7239221415ce..7239221415ce 100644 --- a/core/java/android/net/IpSecTunnelInterfaceResponse.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecTunnelInterfaceResponse.aidl diff --git a/core/java/android/net/IpSecTunnelInterfaceResponse.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecTunnelInterfaceResponse.java index e3411e003d6b..e3411e003d6b 100644 --- a/core/java/android/net/IpSecTunnelInterfaceResponse.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecTunnelInterfaceResponse.java diff --git a/core/java/android/net/IpSecUdpEncapResponse.aidl b/packages/ConnectivityT/framework-t/src/android/net/IpSecUdpEncapResponse.aidl index 5e451f3651f1..5e451f3651f1 100644 --- a/core/java/android/net/IpSecUdpEncapResponse.aidl +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecUdpEncapResponse.aidl diff --git a/core/java/android/net/IpSecUdpEncapResponse.java b/packages/ConnectivityT/framework-t/src/android/net/IpSecUdpEncapResponse.java index 4e7ba9b515d0..4e7ba9b515d0 100644 --- a/core/java/android/net/IpSecUdpEncapResponse.java +++ b/packages/ConnectivityT/framework-t/src/android/net/IpSecUdpEncapResponse.java diff --git a/packages/ConnectivityT/service/Android.bp b/packages/ConnectivityT/service/Android.bp index 6a64910609ff..7b8817692b74 100644 --- a/packages/ConnectivityT/service/Android.bp +++ b/packages/ConnectivityT/service/Android.bp @@ -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. filegroup { name: "services.connectivity-tiramisu-sources", srcs: [ + ":services.connectivity-ipsec-sources", ":services.connectivity-netstats-sources", ":services.connectivity-nsd-sources", ], path: "src", - visibility: [ - "//frameworks/base/services/core", - ], -}
\ No newline at end of file + visibility: ["//frameworks/base/services/core"], +} diff --git a/services/core/java/com/android/server/IpSecService.java b/packages/ConnectivityT/service/src/com/android/server/IpSecService.java index aeb814327e66..aeb814327e66 100644 --- a/services/core/java/com/android/server/IpSecService.java +++ b/packages/ConnectivityT/service/src/com/android/server/IpSecService.java |