Convert INetdEventListener to stable AIDL.
1. Add a new netd_event_listener_interface aidl_interface target.
This interface is defined by netd and implemented by the
framework.
2. Delete the netd_metrics_aidl filegroup and use the AIDL
interface everywhere in netd.
Test: builds, boots
Test: system/netd/tests/runtests.sh
Change-Id: I70f2d51183dcbde03db932b66f44c2cb5579e311
diff --git a/resolv/Android.bp b/resolv/Android.bp
index 41a53e2..10aba5f 100644
--- a/resolv/Android.bp
+++ b/resolv/Android.bp
@@ -50,7 +50,6 @@
test_suites: ["device-tests"],
defaults: ["netd_defaults"],
srcs: [
- ":netd_metrics_aidl",
"dns_responder/dns_responder.cpp",
"resolver_test.cpp",
],
@@ -73,6 +72,7 @@
"liblogwrap",
"libnetdutils",
"netd_aidl_interface-cpp",
+ "netd_event_listener_interface-cpp",
],
compile_multilib: "both",
sanitize: {
diff --git a/server/Android.bp b/server/Android.bp
index 600d80f..1fcb7ee 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -1,10 +1,15 @@
// AIDL interface between netd and services.core
-filegroup {
- name: "netd_metrics_aidl",
- srcs: ["binder/android/net/metrics/INetdEventListener.aidl"],
- path: "binder",
+aidl_interface {
+ name: "netd_event_listener_interface",
+ local_include_dir: "binder",
+ srcs: [
+ "binder/android/net/metrics/INetdEventListener.aidl"
+ ],
+ api_dir: "binder/api",
}
+
+
// These are used in netd_integration_test
// TODO: fold these into a cc_library_static after converting netd/server to Android.bp
filegroup {
@@ -67,7 +72,6 @@
"UidRanges.cpp",
"WakeupController.cpp",
"XfrmController.cpp",
- ":netd_metrics_aidl",
],
shared_libs: [
"libbpf_android",
@@ -82,6 +86,7 @@
"libqtaguid",
"libssl",
"netd_aidl_interface-cpp",
+ "netd_event_listener_interface-cpp",
],
aidl: {
export_aidl_headers: true,
@@ -121,6 +126,7 @@
"libsysutils",
"libutils",
"netd_aidl_interface-cpp",
+ "netd_event_listener_interface-cpp",
],
static_libs: [
"libnetd_server",
@@ -204,5 +210,6 @@
"libsysutils",
"libutils",
"netd_aidl_interface-cpp",
+ "netd_event_listener_interface-cpp",
],
}
diff --git a/tests/Android.bp b/tests/Android.bp
index 93deb5d..9344073 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -32,7 +32,6 @@
defaults: ["netd_defaults"],
srcs: [
":netd_integration_test_shared",
- ":netd_metrics_aidl",
"binder_test.cpp",
"bpf_base_test.cpp",
"netd_test.cpp",
@@ -59,6 +58,7 @@
"libnetdbpf",
"libnetdutils",
"netd_aidl_interface-cpp",
+ "netd_event_listener_interface-cpp",
],
compile_multilib: "both",
multilib: {
diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp
index 60e30cf..fae8ee4 100644
--- a/tests/benchmarks/Android.bp
+++ b/tests/benchmarks/Android.bp
@@ -14,6 +14,7 @@
"libnetd_test_dnsresponder",
"libutils",
"netd_aidl_interface-cpp",
+ "netd_event_listener_interface-cpp",
],
aidl: {
include_dirs: ["system/netd/server/binder"],
@@ -27,7 +28,6 @@
"system/netd/resolv/dns_responder",
],
srcs: [
- ":netd_metrics_aidl",
"main.cpp",
"connect_benchmark.cpp",
"dns_benchmark.cpp",
