diff options
| author | Ken Chen <cken@google.com> | 2022-04-20 15:10:31 +0800 |
|---|---|---|
| committer | Ken Chen <cken@google.com> | 2022-04-20 16:51:07 +0800 |
| commit | b2d8888eb1db72d1c710f7f4e3c6ff78db416733 (patch) | |
| tree | 32d5074cec948170a1d31844a19d0b22313294e4 /tests | |
| parent | 3a049f25485ff1ba30d5ba9950652f9dfd8df38f (diff) | |
| download | netd-b2d8888eb1db72d1c710f7f4e3c6ff78db416733.tar.gz | |
Use netd_aidl_interface wrappers
To avoid tediously update netd_aidl_interface-V*-cpp on all users, use
wrappers instead of the one with a specific version.
Bug: 220392885
Test: TH
Change-Id: I15194e978557d687e87ec05ce401b4feff418a73
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.bp | 12 | ||||
| -rw-r--r-- | tests/benchmarks/Android.bp | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index 21830d6d..ff918cc1 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -37,7 +37,10 @@ cc_test_library { cc_test_library { name: "libnetd_test_unsol_service", - defaults: ["netd_defaults"], + defaults: [ + "netd_aidl_interface_lateststable_cpp_shared", + "netd_defaults", + ], srcs: [ "TestUnsolService.cpp" ], @@ -52,7 +55,6 @@ cc_test_library { "libnetutils", "libsysutils", "libutils", - "netd_aidl_interface-V8-cpp", ], } @@ -74,7 +76,10 @@ cc_test { "vts" ], require_root: true, - defaults: ["netd_defaults"], + defaults: [ + "netd_aidl_interface_lateststable_cpp_static", + "netd_defaults", + ], tidy: false, // cuts test build time by almost 1 minute srcs: [ ":netd_integration_test_shared", @@ -109,7 +114,6 @@ cc_test { "libnettestutils", "libtcutils", "mdns_aidl_interface-V1-cpp", - "netd_aidl_interface-V8-cpp", "netd_event_listener_interface-V1-cpp", "oemnetd_aidl_interface-cpp", ], diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp index 95c00aa6..13c8105f 100644 --- a/tests/benchmarks/Android.bp +++ b/tests/benchmarks/Android.bp @@ -11,7 +11,10 @@ package { cc_benchmark { name: "netd_benchmark", - defaults: ["netd_defaults"], + defaults: [ + "netd_aidl_interface_lateststable_cpp_static", + "netd_defaults", + ], shared_libs: [ "libbase", "libbinder_ndk", @@ -23,7 +26,6 @@ cc_benchmark { static_libs: [ "libnetd_test_dnsresponder_ndk", "dnsresolver_aidl_interface-lateststable-ndk", - "netd_aidl_interface-lateststable-cpp", // system/netd/server/UidRanges.h "netd_aidl_interface-lateststable-ndk", "netd_event_listener_interface-lateststable-ndk", ], |