Move bpf map and program definition into shared header
The constant definitions of the pinned location of bpf programs and maps
are used by netd, bpfloader now and will be used by the bpf kernel c
program in the future. Move them into bpf_shared.h so they can be
properly included by kernel programs as well.
Bug: 112328133
Test: Build and flash devices, the programs and maps get pinned
properly.
Change-Id: I5fed66cd7e9c9a140fdf57835dc01b82b28e0ea7
diff --git a/server/BandwidthControllerTest.cpp b/server/BandwidthControllerTest.cpp
index b5b7e7f..6be46bd 100644
--- a/server/BandwidthControllerTest.cpp
+++ b/server/BandwidthControllerTest.cpp
@@ -35,6 +35,7 @@
#include "Fwmark.h"
#include "IptablesBaseTest.h"
#include "bpf/BpfUtils.h"
+#include "bpf/bpf_shared.h"
#include "tun_interface.h"
using ::testing::ByMove;
@@ -46,10 +47,6 @@
using android::base::Join;
using android::base::StringPrintf;
-using android::bpf::XT_BPF_BLACKLIST_PROG_PATH;
-using android::bpf::XT_BPF_EGRESS_PROG_PATH;
-using android::bpf::XT_BPF_INGRESS_PROG_PATH;
-using android::bpf::XT_BPF_WHITELIST_PROG_PATH;
using android::net::TunInterface;
using android::netdutils::status::ok;
using android::netdutils::UniqueFile;