From f15ccef23b82d7350898a1ca492e86e2b18f8f55 Mon Sep 17 00:00:00 2001 From: Yan Yan Date: Wed, 9 Jul 2025 01:22:49 +0000 Subject: [PATCH] Prepare to move VCN: Define utility lib for IPsec module This is a preparation CL before moving VCN code from frameworks/base to p/m/Connectivity/ After VCN is move out of frameworks/base/, the IPsec module will no longer include PersistableBundleUtils via framework-ike-shared-srcs but will do that via vcn-utils-framework-ipsec Bug: 379938062 Flag: EXEMPT; pure refactoring Test: CtsIkeTestCases, FrameworksIkeTestCases Change-Id: I2d405be630a05f5019e7711946fa46b4cf2a6ef8 --- Vcn/framework-b/Android.bp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Vcn/framework-b/Android.bp b/Vcn/framework-b/Android.bp index c531233598..7103c7ce26 100644 --- a/Vcn/framework-b/Android.bp +++ b/Vcn/framework-b/Android.bp @@ -31,6 +31,22 @@ filegroup { ], } +// Utility library for the IPsec module +java_library { + name: "vcn-utils-framework-ipsec", + sdk_version: "module_current", + min_sdk_version: "30", + srcs: ["src/android/net/vcn/util/PersistableBundleUtils.java"], + libs: [ + "framework-annotations-lib", + "net-utils-framework-vcn", // For HexDump.java + ], + visibility: [ + "//packages/modules/IPsec", + ], + apex_available: ["com.android.ipsec"], +} + java_defaults { name: "framework-connectivity-b-defaults-base", sdk_version: "module_current",