diff --git a/netd/Android.bp b/netd/Android.bp index 38a11acb3e..b98a85954e 100644 --- a/netd/Android.bp +++ b/netd/Android.bp @@ -31,12 +31,10 @@ cc_library { "BpfHandler.cpp", "NetdUpdatable.cpp", ], - static_libs: [ - "libbase", - "libnetdutils", - ], shared_libs: [ + "libbase", "liblog", + "libnetdutils", ], export_include_dirs: ["include"], header_abi_checker: { diff --git a/service/Android.bp b/service/Android.bp index 637c1f6c1b..2e997c5e09 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -67,15 +67,15 @@ cc_library_shared { "libbase_headers", ], static_libs: [ - "libbase", "libclat", "libip_checksum", - "libnetdutils", "libnetjniutils", "libtraffic_controller", "netd_aidl_interface-lateststable-ndk", ], shared_libs: [ + "libbase", + "libnetdutils", "liblog", "libnativehelper", ], diff --git a/service/native/Android.bp b/service/native/Android.bp index 487fca529f..cb26bc3c1c 100644 --- a/service/native/Android.bp +++ b/service/native/Android.bp @@ -28,7 +28,6 @@ cc_library { "bpf_connectivity_headers", ], static_libs: [ - "libnetdutils", // TrafficController would use the constants of INetd so that add // netd_aidl_interface-lateststable-ndk. "netd_aidl_interface-lateststable-ndk", @@ -37,6 +36,7 @@ cc_library { // TODO: Find a good way to remove libbase. "libbase", "libcutils", + "libnetdutils", "libutils", "liblog", ],