266868246a
Remove StaticIpConfigurationParcelable and ApfCapabilitiesParcelable and use StaticIpConfiguration and ApfCapabilities directly. These two classes are SystemApi and defined in framework.jar, so no stability guarantee is needed: the parceled and unparceled class will always be the framework.jar version. Bug: 126477266 Fixes: 126477266 Test: atest FrameworksNetTests NetworkStackTests Test: flashed, booted, WiFi and captive portal works. Change-Id: Iaf80ae23e003752cc6d2300700021931923b6533
88 lines
2.8 KiB
Plaintext
88 lines
2.8 KiB
Plaintext
// AIDL interfaces between the core system and the networking mainline module.
|
|
aidl_interface {
|
|
name: "ipmemorystore-aidl-interfaces",
|
|
local_include_dir: "java",
|
|
srcs: [
|
|
// TODO: Define and use a filegroup for these files, since they're also used in
|
|
// networkstack-aidl-interfaces. This does not appear to work at the moment.
|
|
"java/android/net/IIpMemoryStore.aidl",
|
|
"java/android/net/IIpMemoryStoreCallbacks.aidl",
|
|
"java/android/net/ipmemorystore/**/*.aidl",
|
|
],
|
|
backend: {
|
|
ndk: {
|
|
enabled: false,
|
|
},
|
|
cpp: {
|
|
enabled: false,
|
|
},
|
|
},
|
|
api_dir: "aidl/networkstack",
|
|
}
|
|
|
|
aidl_interface {
|
|
name: "networkstack-aidl-interfaces",
|
|
local_include_dir: "java",
|
|
include_dirs: ["frameworks/base/core/java"], // For framework parcelables.
|
|
srcs: [
|
|
"java/android/net/DhcpResultsParcelable.aidl",
|
|
"java/android/net/IIpMemoryStore.aidl",
|
|
"java/android/net/IIpMemoryStoreCallbacks.aidl",
|
|
"java/android/net/INetworkMonitor.aidl",
|
|
"java/android/net/INetworkMonitorCallbacks.aidl",
|
|
"java/android/net/INetworkStackConnector.aidl",
|
|
"java/android/net/INetworkStackStatusCallback.aidl",
|
|
"java/android/net/InitialConfigurationParcelable.aidl",
|
|
"java/android/net/PrivateDnsConfigParcel.aidl",
|
|
"java/android/net/ProvisioningConfigurationParcelable.aidl",
|
|
"java/android/net/TcpKeepalivePacketDataParcelable.aidl",
|
|
"java/android/net/dhcp/DhcpServingParamsParcel.aidl",
|
|
"java/android/net/dhcp/IDhcpServer.aidl",
|
|
"java/android/net/dhcp/IDhcpServerCallbacks.aidl",
|
|
"java/android/net/ip/IIpClient.aidl",
|
|
"java/android/net/ip/IIpClientCallbacks.aidl",
|
|
"java/android/net/ipmemorystore/**/*.aidl",
|
|
],
|
|
backend: {
|
|
ndk: {
|
|
enabled: false,
|
|
},
|
|
cpp: {
|
|
enabled: false,
|
|
},
|
|
},
|
|
api_dir: "aidl/networkstack",
|
|
}
|
|
|
|
java_library_static {
|
|
name: "services.net",
|
|
srcs: ["java/**/*.java"],
|
|
static_libs: [
|
|
"netd_aidl_interface-java",
|
|
"networkstack-aidl-interfaces-java",
|
|
]
|
|
}
|
|
|
|
java_library_static {
|
|
name: "ipmemorystore-client",
|
|
sdk_version: "system_current",
|
|
srcs: [
|
|
":framework-annotations",
|
|
"java/android/net/IpMemoryStoreClient.java",
|
|
"java/android/net/ipmemorystore/**.java",
|
|
],
|
|
static_libs: [
|
|
"ipmemorystore-aidl-interfaces-java",
|
|
]
|
|
}
|
|
|
|
filegroup {
|
|
name: "services-networkstack-shared-srcs",
|
|
srcs: [
|
|
"java/android/net/ip/InterfaceController.java", // TODO: move to NetworkStack with tethering
|
|
"java/android/net/util/InterfaceParams.java", // TODO: move to NetworkStack with IpServer
|
|
"java/android/net/shared/*.java",
|
|
"java/android/net/netlink/*.java",
|
|
],
|
|
}
|