commit aebdb6c0c812292fccdc85bf7da239a60404b9ce
author Maciej Żenczykowski <maze@google.com> Tue Oct 10 06:29:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 10 06:29:50 2023 +0000
tree ee8684eba866fe4dd06929d47bfd8fa3d8f84d43
parent 1acdaea2aff0eb7268c4328eb901ea3b1c448143
parent f320624f27aafba1f20a0448ca2a1d4cc4980d06

bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0 am: 0133896d6c am: f320624f27

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: Id8438dfe8aed04dce982f04c91972d6f39818ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bpfloader/Android.bp

diff --git a/bpfloader/Android.bp b/bpfloader/Android.bp
index 18954eb..b8c6514 100644
--- a/bpfloader/Android.bp
+++ b/bpfloader/Android.bp
@@ -40,11 +40,10 @@
 
     header_libs: ["bpf_headers"],
     shared_libs: [
-        "libcutils",
-        "libbpf_android",
         "libbase",
+        "libbpf_android",
+        "libcutils",
         "liblog",
-        "libnetdutils",
     ],
     srcs: [
         "BpfLoader.cpp",

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 99a2ab4..d476a48 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -46,8 +46,6 @@
 #include <android-base/unique_fd.h>
 #include <libbpf_android.h>
 #include <log/log.h>
-#include <netdutils/Misc.h>
-#include <netdutils/Slice.h>
 #include "BpfSyscallWrappers.h"
 #include "bpf/BpfUtils.h"