commit cf9194033fbbf1e7f0a82a54bec8fa7675b65c6e
author Maciej Żenczykowski <maze@google.com> Thu Dec 23 22:24:40 2021 -0800
committer Maciej Żenczykowski <maze@google.com> Tue Dec 28 17:55:54 2021 -0800
tree b3514e2dd421c4eee63730db1df4535d9d925067
parent cd9bcad6a7eb1fe364b9988ee3ad4e684a28827f

remove libbpf_android dependency

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I267996b854de6c967162ad0694b1464dc28d8d93

libnetdbpf/Android.bp

diff --git a/libnetdbpf/Android.bp b/libnetdbpf/Android.bp
index 3ab1905..d586d68 100644
--- a/libnetdbpf/Android.bp
+++ b/libnetdbpf/Android.bp
@@ -33,7 +33,6 @@
     ],
     shared_libs: [
         "libbase",
-        "libbpf_android",
         "liblog",
         "libnetdutils",
     ],
@@ -56,7 +55,6 @@
     static_libs: ["libgmock"],
     shared_libs: [
         "libbase",
-        "libbpf_android",
         "liblog",
         "libnetdbpf",
         "libnetdutils",

server/Android.bp

diff --git a/server/Android.bp b/server/Android.bp
index 1ac04fe..0bbd47c 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -71,7 +71,6 @@
         "XfrmController.cpp",
     ],
     shared_libs: [
-        "libbpf_android",
         "libbase",
         "libbinder",
         "libnetdbpf",
@@ -112,7 +111,6 @@
         "android.system.net.netd@1.1",
         "libbase",
         "libbinder",
-        "libbpf_android",
         "libcutils",
         "libdl",
         "libhidlbase",
@@ -236,7 +234,6 @@
     shared_libs: [
         "libbase",
         "libbinder",
-        "libbpf_android",
         "libcrypto",
         "libcutils",
         "liblog",

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 27d00e5..d0c4764 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -104,7 +104,6 @@
         "libnetd_test_tun_interface",
         "libnetd_test_unsol_service",
         "libnetd_test_utils",
-        "libbpf_android",
         "libnetdbpf",
         "libnetdutils",
         "libqtaguid",

tests/benchmarks/Android.bp

diff --git a/tests/benchmarks/Android.bp b/tests/benchmarks/Android.bp
index 86747d7..95c00aa 100644
--- a/tests/benchmarks/Android.bp
+++ b/tests/benchmarks/Android.bp
@@ -47,9 +47,9 @@
     name: "bpf_benchmark",
     defaults: ["netd_defaults"],
     require_root: true,
+    header_libs: ["bpf_headers"],
     shared_libs: [
         "libbase",
-        "libbpf_android",
         "liblog",
         "libnetdutils",
     ],