Snap for 9446874 from ac107a2ef74cb969603d8bb5224bb344f0e12973 to mainline-media-swcodec-releaseaml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000android13-mainline-media-swcodec-release

Change-Id: I2c5b1f1a806f36d6aed88c19de69e47449fabfa5

12 files changed, 2 insertions, 17 deletions

diff --git a/server/Android.bp b/server/Android.bp
index 06ea0bab..f9ac8902 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -45,7 +45,6 @@ cc_library_static {
         "system/netd/include",
         "system/netd/server/binder",
     ],
-    header_libs: ["bpf_headers"],
     srcs: [
         "BandwidthController.cpp",
         "Controllers.cpp",
@@ -100,7 +99,6 @@ cc_binary {
     required: [
         "bpfloader",
     ],
-    header_libs: ["bpf_headers"],
     shared_libs: [
         "android.system.net.netd@1.0",
         "android.system.net.netd@1.1",
@@ -204,7 +202,6 @@ cc_test {
         "system/netd/server/binder",
         "system/netd/tests",
     ],
-    header_libs: ["bpf_headers"],
     tidy_timeout_srcs: [
         "BandwidthControllerTest.cpp",
         "InterfaceControllerTest.cpp",
diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp
index 8dba75a5..438dbb8d 100644
--- a/server/BandwidthController.cpp
+++ b/server/BandwidthController.cpp
@@ -56,7 +56,6 @@
 #include "Fwmark.h"
 #include "NetdConstants.h"
 #include "android/net/INetd.h"
-#include "bpf/BpfUtils.h"
 
 /* Alphabetical */
 #define ALERT_IPT_TEMPLATE "%s %s -m quota2 ! --quota %" PRId64" --name %s\n"
diff --git a/server/FirewallController.cpp b/server/FirewallController.cpp
index b3c6b025..47975dd3 100644
--- a/server/FirewallController.cpp
+++ b/server/FirewallController.cpp
@@ -34,7 +34,6 @@
 #include "Controllers.h"
 #include "FirewallController.h"
 #include "NetdConstants.h"
-#include "bpf/BpfUtils.h"
 
 using android::base::Join;
 using android::base::StringAppendF;
diff --git a/server/FirewallController.h b/server/FirewallController.h
index 6d6f48fa..227ceeb9 100644
--- a/server/FirewallController.h
+++ b/server/FirewallController.h
@@ -24,7 +24,6 @@
 #include <vector>
 
 #include "NetdConstants.h"
-#include "bpf/BpfUtils.h"
 
 namespace android {
 namespace net {
diff --git a/server/IptablesRestoreControllerTest.cpp b/server/IptablesRestoreControllerTest.cpp
index cecdf4d9..1999fbf9 100644
--- a/server/IptablesRestoreControllerTest.cpp
+++ b/server/IptablesRestoreControllerTest.cpp
@@ -36,7 +36,6 @@
 #include <netdutils/Stopwatch.h>
 
 #include "NetdConstants.h"
-#include "bpf/BpfUtils.h"
 
 #define XT_LOCK_NAME "/system/etc/xtables.lock"
 #define XT_LOCK_ATTEMPTS 10
diff --git a/server/MDnsSdListener.cpp b/server/MDnsSdListener.cpp
index 1d1ea40a..0a4cd61a 100644
--- a/server/MDnsSdListener.cpp
+++ b/server/MDnsSdListener.cpp
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <linux/if.h>
+#include <net/if.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <pthread.h>
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index f1441397..ee85910e 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -30,6 +30,7 @@
 #include <android-base/strings.h>
 #include <cutils/misc.h>  // FIRST_APPLICATION_UID
 #include <netd_resolv/resolv.h>
+#include <net/if.h>
 #include "log/log.h"
 
 #include "Controllers.h"
diff --git a/server/TcUtils.h b/server/TcUtils.h
index 4b1b2b9f..9b157191 100644
--- a/server/TcUtils.h
+++ b/server/TcUtils.h
@@ -16,17 +16,12 @@
 
 #pragma once
 
-#include <android-base/result.h>
 #include <errno.h>
 #include <linux/if_ether.h>
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
 #include <tcutils/tcutils.h>
 
-#include <string>
-
-#include "bpf/BpfUtils.h"
-
 namespace android {
 namespace net {
 
diff --git a/server/TetherController.h b/server/TetherController.h
index d2195f23..4aa2a2d6 100644
--- a/server/TetherController.h
+++ b/server/TetherController.h
@@ -27,7 +27,6 @@
 
 #include "NetdConstants.h"
 #include "android-base/result.h"
-#include "bpf/BpfMap.h"
 
 #include "android/net/TetherOffloadRuleParcel.h"
 
diff --git a/tests/Android.bp b/tests/Android.bp
index 47275ac3..ea3b2c5b 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -89,7 +89,6 @@ cc_test {
         "netd_test.cpp",
     ],
     include_dirs: ["system/netd/server"],
-    header_libs: ["bpf_connectivity_headers"],
     shared_libs: [
         "libbase",
         "libbinder",
diff --git a/tests/benchmarks/bpf_benchmark.cpp b/tests/benchmarks/bpf_benchmark.cpp
index 4de80661..4614142f 100644
--- a/tests/benchmarks/bpf_benchmark.cpp
+++ b/tests/benchmarks/bpf_benchmark.cpp
@@ -20,7 +20,6 @@
 
 #define BPF_MAP_MAKE_VISIBLE_FOR_TESTING
 #include "bpf/BpfMap.h"
-#include "bpf/BpfUtils.h"
 
 constexpr uint32_t TEST_MAP_SIZE = 10000;
 
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index 40e5759b..5204576d 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -52,8 +52,6 @@
 #include <android-base/strings.h>
 #include <android/multinetwork.h>
 #include <binder/IPCThreadState.h>
-#include <bpf/BpfMap.h>
-#include <bpf/BpfUtils.h>
 #include <com/android/internal/net/BnOemNetdUnsolicitedEventListener.h>
 #include <com/android/internal/net/IOemNetd.h>
 #include <cutils/multiuser.h>