1d2a753ca4
Currently, various components in the system server depend directly on numbered versions of the netd and dnsresolver AIDL interfaces. Introduce a new build target that only includes the latest stable version, and depend on that instead. This ensures that all components in the system server use the same version of the generated classes. Depending on multiple versions of the generated classes in the same (classloader) has in the past resulted in code compiled using a newer version using a generated class from an older version, and crashing with NoSuchMethodError when it calls a method that didn't exist. Also remove the dependency from wifi code to DNS resolver AIDL interfaces. Wifi does not (and should not) call the DNS resolver directly. Test: m Bug: 143732914 Bug: 153596226 Change-Id: I2c45853171df8d2c9726f4f12204a48862b30bb6 Merged-In: I2c45853171df8d2c9726f4f12204a48862b30bb6
70 lines
2.1 KiB
Plaintext
70 lines
2.1 KiB
Plaintext
filegroup {
|
|
name: "services.net-sources",
|
|
srcs: ["java/**/*.java"],
|
|
path: "java",
|
|
visibility: ["//frameworks/base/services"],
|
|
}
|
|
|
|
java_library_static {
|
|
name: "services.net",
|
|
srcs: [
|
|
":net-module-utils-srcs",
|
|
":services.net-sources",
|
|
],
|
|
static_libs: [
|
|
"netd_aidl_interfaces-platform-java",
|
|
"netlink-client",
|
|
"networkstack-client",
|
|
"net-utils-services-common",
|
|
],
|
|
}
|
|
|
|
// Version of services.net for usage by the wifi mainline module.
|
|
// Note: This is compiled against module_current.
|
|
// TODO(b/145825329): This should be moved to networkstack-client,
|
|
// with dependencies moved to frameworks/libs/net right.
|
|
java_library {
|
|
name: "services.net-module-wifi",
|
|
srcs: [
|
|
":framework-services-net-module-wifi-shared-srcs",
|
|
":net-module-utils-srcs",
|
|
"java/android/net/ip/IpClientCallbacks.java",
|
|
"java/android/net/ip/IpClientManager.java",
|
|
"java/android/net/ip/IpClientUtil.java",
|
|
"java/android/net/util/KeepalivePacketDataUtil.java",
|
|
"java/android/net/util/NetworkConstants.java",
|
|
"java/android/net/IpMemoryStore.java",
|
|
"java/android/net/NetworkMonitorManager.java",
|
|
"java/android/net/TcpKeepalivePacketData.java",
|
|
],
|
|
sdk_version: "module_current",
|
|
libs: [
|
|
"unsupportedappusage",
|
|
"framework-wifi-util-lib",
|
|
],
|
|
static_libs: [
|
|
// All the classes in netd_aidl_interface must be jarjar so they do not conflict with the
|
|
// classes generated by netd_aidl_interfaces-platform-java above.
|
|
"netd_aidl_interface-V3-java",
|
|
"netlink-client",
|
|
"networkstack-client",
|
|
"net-utils-services-common",
|
|
],
|
|
apex_available: [
|
|
"com.android.wifi",
|
|
],
|
|
visibility: [
|
|
"//frameworks/opt/net/wifi/service",
|
|
"//frameworks/opt/net/wifi/tests/wifitests",
|
|
],
|
|
}
|
|
|
|
filegroup {
|
|
name: "services-tethering-shared-srcs",
|
|
srcs: [
|
|
":framework-annotations",
|
|
"java/android/net/util/NetworkConstants.java",
|
|
],
|
|
visibility: ["//frameworks/base/packages/Tethering"],
|
|
}
|