commit 2f7dac1badab182bf96db872c5b3bfcfc03d0bd9
author Maciej Żenczykowski <maze@google.com> Mon Jan 31 20:25:41 2022 -0800
committer Maciej Żenczykowski <maze@google.com> Wed Feb 02 16:38:36 2022 -0800
tree 11728db71bedabeea3083c0f83a79f9e41d640a9
parent 0bbe3d2ce4c371b106a124a4be30b3f52c9ffcbb

remove spurious headers

bpf_connectivity_headers already pulls in bpf_headers,
which already pulls in bpf_syscall_wrappers.

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

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index af247de..ae96e8c 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -99,7 +99,6 @@
     ],
     min_sdk_version: "30",
     header_libs: [
-        "bpf_syscall_wrappers",
         "bpf_connectivity_headers",
     ],
     srcs: [

service/native/Android.bp

diff --git a/service/native/Android.bp b/service/native/Android.bp
index a20c54f..487fca5 100644
--- a/service/native/Android.bp
+++ b/service/native/Android.bp
@@ -26,8 +26,6 @@
     ],
     header_libs: [
         "bpf_connectivity_headers",
-        "bpf_headers",
-        "bpf_syscall_wrappers",
     ],
     static_libs: [
         "libnetdutils",

service/native/libs/libclat/Android.bp

diff --git a/service/native/libs/libclat/Android.bp b/service/native/libs/libclat/Android.bp
index 0f8caf4..17ee996 100644
--- a/service/native/libs/libclat/Android.bp
+++ b/service/native/libs/libclat/Android.bp
@@ -21,8 +21,6 @@
     defaults: ["netd_defaults"],
     header_libs: [
         "bpf_connectivity_headers",
-        "bpf_headers",
-        "bpf_syscall_wrappers",
         "libbase_headers",
     ],
     srcs: [
@@ -47,8 +45,6 @@
     test_suites: ["device-tests"],
     header_libs: [
         "bpf_connectivity_headers",
-        "bpf_headers",
-        "bpf_syscall_wrappers",
     ],
     srcs: [
         "TcUtilsTest.cpp",