diff options
| author | Jeongik Cha <jeongik@google.com> | 2020-08-14 23:13:11 +0900 |
|---|---|---|
| committer | Jeongik Cha <jeongik@google.com> | 2020-08-14 23:25:15 +0900 |
| commit | 144af0356cca3a85f305c7cea1da8a27217f79c5 (patch) | |
| tree | 30aeb088d21bfd9c3e8ed4102b69db52129d4ed7 | |
| parent | 957333d2a99861bc9e01a96605a6de1f4ea4cabd (diff) | |
| download | DnsResolver-144af0356cca3a85f305c7cea1da8a27217f79c5.tar.gz | |
Add '-unstable' to solve ODR violation
The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem
Bug: 146436251
Test: m nothing
Change-Id: I05c0ca6b545eed3b37f95e4f41502f674ba09242
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | tests/Android.bp | 6 | ||||
| -rw-r--r-- | tests/dns_metrics_listener/Android.bp | 2 | ||||
| -rw-r--r-- | tests/dns_responder/Android.bp | 2 |
4 files changed, 7 insertions, 7 deletions
@@ -134,7 +134,7 @@ cc_library { "libstatslog_resolv", "libstatspush_compat", "libsysutils", - "netd_event_listener_interface-ndk_platform", + "netd_event_listener_interface-unstable-ndk_platform", "server_configurable_flags", "stats_proto", ], @@ -267,7 +267,7 @@ cc_test { static_libs: [ "dnsresolver_aidl_interface-unstable-ndk_platform", "netd_aidl_interface-ndk_platform", - "netd_event_listener_interface-ndk_platform", + "netd_event_listener_interface-unstable-ndk_platform", "libcutils", "libgmock", "libnetd_resolv", diff --git a/tests/Android.bp b/tests/Android.bp index 5dcf89b6..ee423910 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -102,7 +102,7 @@ cc_test { "libnetdutils", "libprotobuf-cpp-lite", "netd_aidl_interface-ndk_platform", - "netd_event_listener_interface-ndk_platform", + "netd_event_listener_interface-unstable-ndk_platform", "server_configurable_flags", "stats_proto", ], @@ -135,7 +135,7 @@ cc_test { "libnetd_test_resolv_utils", "libnetdutils", "libutils", - "netd_event_listener_interface-ndk_platform", + "netd_event_listener_interface-unstable-ndk_platform", "netd_aidl_interface-ndk_platform", ], } @@ -175,7 +175,7 @@ cc_test { "libssl", "libutils", "netd_aidl_interface-ndk_platform", - "netd_event_listener_interface-ndk_platform", + "netd_event_listener_interface-unstable-ndk_platform", "libipchecksum", ], // This test talks to the DnsResolver module over a binary protocol on a socket, so keep it as diff --git a/tests/dns_metrics_listener/Android.bp b/tests/dns_metrics_listener/Android.bp index 74c545e4..0122dc08 100644 --- a/tests/dns_metrics_listener/Android.bp +++ b/tests/dns_metrics_listener/Android.bp @@ -11,6 +11,6 @@ cc_test_library { ], static_libs: [ "libutils", - "netd_event_listener_interface-ndk_platform", + "netd_event_listener_interface-unstable-ndk_platform", ], } diff --git a/tests/dns_responder/Android.bp b/tests/dns_responder/Android.bp index 832ac88c..855e72bf 100644 --- a/tests/dns_responder/Android.bp +++ b/tests/dns_responder/Android.bp @@ -18,7 +18,7 @@ cc_test_library { "libnetdutils", "libssl", "netd_aidl_interface-ndk_platform", - "netd_event_listener_interface-ndk_platform", + "netd_event_listener_interface-unstable-ndk_platform", ], srcs: [ "dns_responder.cpp", |