From 8f4e23616c25f06a266196f919dea0e8712da359 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Fri, 10 Dec 2021 17:36:49 +0800 Subject: [PATCH] Move IpSec associated files to f/b/packages/ConnectivityT IpSecService is going to be moved into Connectivity mainline module. Move all ipsec associated files to packages/ConnectivityT so that it can be easily migrate these files to connectivity module after clearing the hidden API usages. Bug: 204153604 Test: build pass FrameworksNetTests CtsNetTestCases Change-Id: I562b47f18e345988a2638cf886f86818f9144b91 --- framework-t/Sources.bp | 19 +++++++++++++++--- .../src}/android/net/IIpSecService.aidl | 0 .../src}/android/net/IpSecAlgorithm.java | 0 .../src}/android/net/IpSecConfig.aidl | 0 .../src}/android/net/IpSecConfig.java | 0 .../src}/android/net/IpSecManager.java | 0 .../src}/android/net/IpSecSpiResponse.aidl | 0 .../src}/android/net/IpSecSpiResponse.java | 0 .../src}/android/net/IpSecTransform.java | 0 .../android/net/IpSecTransformResponse.aidl | 0 .../android/net/IpSecTransformResponse.java | 0 .../net/IpSecTunnelInterfaceResponse.aidl | 0 .../net/IpSecTunnelInterfaceResponse.java | 0 .../android/net/IpSecUdpEncapResponse.aidl | 0 .../android/net/IpSecUdpEncapResponse.java | 0 service-t/Sources.bp | 20 +++++++++++++++---- .../src}/com/android/server/IpSecService.java | 0 17 files changed, 32 insertions(+), 7 deletions(-) rename {core/java => framework-t/src}/android/net/IIpSecService.aidl (100%) rename {core/java => framework-t/src}/android/net/IpSecAlgorithm.java (100%) rename {core/java => framework-t/src}/android/net/IpSecConfig.aidl (100%) rename {core/java => framework-t/src}/android/net/IpSecConfig.java (100%) rename {core/java => framework-t/src}/android/net/IpSecManager.java (100%) rename {core/java => framework-t/src}/android/net/IpSecSpiResponse.aidl (100%) rename {core/java => framework-t/src}/android/net/IpSecSpiResponse.java (100%) rename {core/java => framework-t/src}/android/net/IpSecTransform.java (100%) rename {core/java => framework-t/src}/android/net/IpSecTransformResponse.aidl (100%) rename {core/java => framework-t/src}/android/net/IpSecTransformResponse.java (100%) rename {core/java => framework-t/src}/android/net/IpSecTunnelInterfaceResponse.aidl (100%) rename {core/java => framework-t/src}/android/net/IpSecTunnelInterfaceResponse.java (100%) rename {core/java => framework-t/src}/android/net/IpSecUdpEncapResponse.aidl (100%) rename {core/java => framework-t/src}/android/net/IpSecUdpEncapResponse.java (100%) rename {services/core/java => service-t/src}/com/android/server/IpSecService.java (100%) diff --git a/framework-t/Sources.bp b/framework-t/Sources.bp index 3e82b28ce6..931a55b27d 100644 --- a/framework-t/Sources.bp +++ b/framework-t/Sources.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/framework-t/src/android/net/IIpSecService.aidl similarity index 100% rename from core/java/android/net/IIpSecService.aidl rename to framework-t/src/android/net/IIpSecService.aidl diff --git a/core/java/android/net/IpSecAlgorithm.java b/framework-t/src/android/net/IpSecAlgorithm.java similarity index 100% rename from core/java/android/net/IpSecAlgorithm.java rename to framework-t/src/android/net/IpSecAlgorithm.java diff --git a/core/java/android/net/IpSecConfig.aidl b/framework-t/src/android/net/IpSecConfig.aidl similarity index 100% rename from core/java/android/net/IpSecConfig.aidl rename to framework-t/src/android/net/IpSecConfig.aidl diff --git a/core/java/android/net/IpSecConfig.java b/framework-t/src/android/net/IpSecConfig.java similarity index 100% rename from core/java/android/net/IpSecConfig.java rename to framework-t/src/android/net/IpSecConfig.java diff --git a/core/java/android/net/IpSecManager.java b/framework-t/src/android/net/IpSecManager.java similarity index 100% rename from core/java/android/net/IpSecManager.java rename to framework-t/src/android/net/IpSecManager.java diff --git a/core/java/android/net/IpSecSpiResponse.aidl b/framework-t/src/android/net/IpSecSpiResponse.aidl similarity index 100% rename from core/java/android/net/IpSecSpiResponse.aidl rename to framework-t/src/android/net/IpSecSpiResponse.aidl diff --git a/core/java/android/net/IpSecSpiResponse.java b/framework-t/src/android/net/IpSecSpiResponse.java similarity index 100% rename from core/java/android/net/IpSecSpiResponse.java rename to framework-t/src/android/net/IpSecSpiResponse.java diff --git a/core/java/android/net/IpSecTransform.java b/framework-t/src/android/net/IpSecTransform.java similarity index 100% rename from core/java/android/net/IpSecTransform.java rename to framework-t/src/android/net/IpSecTransform.java diff --git a/core/java/android/net/IpSecTransformResponse.aidl b/framework-t/src/android/net/IpSecTransformResponse.aidl similarity index 100% rename from core/java/android/net/IpSecTransformResponse.aidl rename to framework-t/src/android/net/IpSecTransformResponse.aidl diff --git a/core/java/android/net/IpSecTransformResponse.java b/framework-t/src/android/net/IpSecTransformResponse.java similarity index 100% rename from core/java/android/net/IpSecTransformResponse.java rename to framework-t/src/android/net/IpSecTransformResponse.java diff --git a/core/java/android/net/IpSecTunnelInterfaceResponse.aidl b/framework-t/src/android/net/IpSecTunnelInterfaceResponse.aidl similarity index 100% rename from core/java/android/net/IpSecTunnelInterfaceResponse.aidl rename to framework-t/src/android/net/IpSecTunnelInterfaceResponse.aidl diff --git a/core/java/android/net/IpSecTunnelInterfaceResponse.java b/framework-t/src/android/net/IpSecTunnelInterfaceResponse.java similarity index 100% rename from core/java/android/net/IpSecTunnelInterfaceResponse.java rename to framework-t/src/android/net/IpSecTunnelInterfaceResponse.java diff --git a/core/java/android/net/IpSecUdpEncapResponse.aidl b/framework-t/src/android/net/IpSecUdpEncapResponse.aidl similarity index 100% rename from core/java/android/net/IpSecUdpEncapResponse.aidl rename to framework-t/src/android/net/IpSecUdpEncapResponse.aidl diff --git a/core/java/android/net/IpSecUdpEncapResponse.java b/framework-t/src/android/net/IpSecUdpEncapResponse.java similarity index 100% rename from core/java/android/net/IpSecUdpEncapResponse.java rename to framework-t/src/android/net/IpSecUdpEncapResponse.java diff --git a/service-t/Sources.bp b/service-t/Sources.bp index 6a64910609..7b8817692b 100644 --- a/service-t/Sources.bp +++ b/service-t/Sources.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/service-t/src/com/android/server/IpSecService.java similarity index 100% rename from services/core/java/com/android/server/IpSecService.java rename to service-t/src/com/android/server/IpSecService.java