resolve open review comments wrt. libnetd_offloadutils
This library is not needed and was just added in:
commit 9ce7e66f1b3c30f2c7091d7f7264a582a11fe892
netd_integration_test - add a test for bpf_skb_change_head at mtu limit
Test: atest
Bug: 149816401
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change: https://android-review.googlesource.com/1320843
Merged-In: Idac6defff88e98fc12de16eeffd8efec248bbbe6
Change-Id: Idac6defff88e98fc12de16eeffd8efec248bbbe6
diff --git a/server/Android.bp b/server/Android.bp
index c6695cb..0d5c5eb 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -97,30 +97,13 @@
"InterfaceController.cpp",
"NetlinkCommands.cpp",
"NetlinkListener.cpp",
+ "OffloadUtils.cpp",
"SockDiag.cpp",
"XfrmController.cpp",
"TrafficController.cpp",
],
}
-// For use by netd, netd_integration_test and netd_unit_test
-cc_library_static {
- name: "libnetd_offloadutils",
- defaults: ["netd_defaults"],
- include_dirs: [
- "system/netd/include",
- ],
- srcs: [
- "OffloadUtils.cpp",
- ],
- shared_libs: [
- "libbpf_android",
- "libbase",
- "libnetdbpf",
- "libnetdutils",
- ],
-}
-
// Modules common to both netd and netd_unit_test
cc_library_static {
name: "libnetd_server",
@@ -142,6 +125,7 @@
"NetlinkCommands.cpp",
"NetlinkListener.cpp",
"NetlinkManager.cpp",
+ "OffloadUtils.cpp",
"RouteController.cpp",
"SockDiag.cpp",
"StrictController.cpp",
@@ -212,7 +196,6 @@
"oemnetd_aidl_interface-cpp",
],
static_libs: [
- "libnetd_offloadutils",
"libnetd_server",
],
srcs: [
@@ -301,7 +284,6 @@
],
static_libs: [
"libgmock",
- "libnetd_offloadutils",
"libnetd_server",
"libnetd_test_tun_interface",
"libqtaguid",
diff --git a/tests/Android.bp b/tests/Android.bp
index 8433738..f696bab 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -95,7 +95,6 @@
"libbpf_android",
"libnetdbpf",
"libnetdutils",
- "libnetd_offloadutils",
"libqtaguid",
"netd_aidl_interface-unstable-cpp",
"netd_event_listener_interface-cpp",