diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-10-31 06:34:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-31 06:34:32 +0000 |
| commit | 124ac299f99130430837bfe38d779d7566c17fc8 (patch) | |
| tree | 463f3e0cb40fc4a209baae21822b55457d2b07d1 | |
| parent | 3590062b59e09a1ace3055d0f4302c0fc0a02434 (diff) | |
| parent | b54ecec869a90d34da36af68cf1e9e61e3375369 (diff) | |
| download | netd-124ac299f99130430837bfe38d779d7566c17fc8.tar.gz | |
Merge "Change AIDL module name"
| -rw-r--r-- | server/Android.bp | 14 | ||||
| -rw-r--r-- | tests/Android.bp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/server/Android.bp b/server/Android.bp index ae5d204e..eba80bce 100644 --- a/server/Android.bp +++ b/server/Android.bp @@ -102,7 +102,7 @@ cc_library_static { "libqtaguid", "libssl", "netd_aidl_interface-cpp", - "netd_event_listener_interface-V1-cpp", + "netd_event_listener_interface-cpp", ], header_libs: [ "libnetd_resolv_headers", @@ -142,8 +142,8 @@ cc_binary { "libselinux", "libsysutils", "libutils", - "netd_aidl_interface-cpp", - "netd_event_listener_interface-V1-cpp", + "netd_aidl_interface-unstable-cpp", + "netd_event_listener_interface-cpp", "oemnetd_aidl_interface-cpp", ], static_libs: [ @@ -192,8 +192,8 @@ cc_binary { "liblog", "libutils", "libbinder", - "dnsresolver_aidl_interface-V2-cpp", - "netd_aidl_interface-V2-cpp", + "dnsresolver_aidl_interface-cpp", + "netd_aidl_interface-cpp", ], srcs: [ "ndc.cpp", @@ -236,8 +236,8 @@ cc_test { "libnetd_server", "libnetd_test_tun_interface", "libqtaguid", - "netd_aidl_interface-V2-cpp", - "netd_event_listener_interface-V1-cpp", + "netd_aidl_interface-cpp", + "netd_event_listener_interface-cpp", ], shared_libs: [ "libbase", diff --git a/tests/Android.bp b/tests/Android.bp index 535cae37..1ac413ff 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -93,7 +93,7 @@ cc_test { "libnetdbpf", "libnetdutils", "libqtaguid", - "netd_aidl_interface-cpp", + "netd_aidl_interface-unstable-cpp", "netd_event_listener_interface-cpp", "oemnetd_aidl_interface-cpp", ], |