Move the bpf ELF binary to system/etc/bpf
The bpf ELF binary caused some conflict in different android builds when
parsing it as a prebuilt binary. This commit changes the type of it into
ETC and move the file from system/bin into system/etc/bpf. And the files
are renamed properly.
Test: make and flash the device, files should present in system/etc/bpf
directory
Bug: 72981744
Bug: 30950746
Change-Id: I386f224fd9a3c4e91d2f7a47492ef7c48ccd60ff
diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 726e632..c3a2084 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -45,8 +45,10 @@
using android::base::unique_fd;
using android::netdutils::Slice;
-#define INGRESS_PROG "/system/bin/cgroup_bpf_ingress_prog"
-#define EGRESS_PROG "/system/bin/cgroup_bpf_egress_prog"
+#define BPF_PROG_PATH "/system/etc/bpf"
+
+#define INGRESS_PROG BPF_PROG_PATH"/cgroup_bpf_ingress_prog.o"
+#define EGRESS_PROG BPF_PROG_PATH"/cgroup_bpf_egress_prog.o"
#define MAP_LD_CMD_HEAD 0x18
#define FAIL(str) \