Add XFRM_MIGRATE support and freeze INetd v12.
This commit updates netd_aidl_interface to support
migrating IPsec tunnel mode SA to different source
and destination addresses.
server/aidl_api/netd_aidl_interface/12/ are generated
by "m netd_aidl_interface-freeze-api"
Bug: 169170985
Test: atest netd_integration_test (new tests)
Change-Id: I89b54272c1528f12e6351819e0efe666af7a2946
diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp
index 6cc445b..057ea2a 100644
--- a/staticlibs/netd/Android.bp
+++ b/staticlibs/netd/Android.bp
@@ -21,7 +21,7 @@
sdk_version: "system_current",
min_sdk_version: "29",
static_libs: [
- "netd_aidl_interface-V11-java",
+ "netd_aidl_interface-V12-java",
],
apex_available: [
"//apex_available:platform", // used from services.net
@@ -44,7 +44,7 @@
cc_library_static {
name: "netd_aidl_interface-lateststable-ndk",
whole_static_libs: [
- "netd_aidl_interface-V11-ndk",
+ "netd_aidl_interface-V12-ndk",
],
apex_available: [
"com.android.resolv",
@@ -55,12 +55,12 @@
cc_defaults {
name: "netd_aidl_interface_lateststable_cpp_static",
- static_libs: ["netd_aidl_interface-V11-cpp"],
+ static_libs: ["netd_aidl_interface-V12-cpp"],
}
cc_defaults {
name: "netd_aidl_interface_lateststable_cpp_shared",
- shared_libs: ["netd_aidl_interface-V11-cpp"],
+ shared_libs: ["netd_aidl_interface-V12-cpp"],
}
aidl_interface {
@@ -71,6 +71,7 @@
// AIDL interface that callers can implement to receive networking events from netd.
"binder/android/net/INetdUnsolicitedEventListener.aidl",
"binder/android/net/InterfaceConfigurationParcel.aidl",
+ "binder/android/net/IpSecMigrateInfoParcel.aidl",
"binder/android/net/MarkMaskParcel.aidl",
"binder/android/net/NativeNetworkConfig.aidl",
"binder/android/net/NativeNetworkType.aidl",
@@ -153,6 +154,10 @@
version: "11",
imports: [],
},
+ {
+ version: "12",
+ imports: [],
+ },
],