move net_shared bpf programs into net_shared subdirectory am: 2a36ce48b0
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2071267
Change-Id: I6ffab207294946357f3a97685d3eacc75b724e89
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 74ecfbc..8b49cec 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -77,7 +77,7 @@
// Tethering mainline module: netd, clatd, ...etc
{
.dir = "/apex/com.android.tethering/etc/bpf/net_shared/",
- .prefix = "",
+ .prefix = "net_shared/",
},
// Core operating system
{
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 108c76e..e181f71 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
#include <sys/wait.h>
#include <unistd.h>
-// This is BpfLoader v0.10
+// This is BpfLoader v0.12
#define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 11u
+#define BPFLOADER_VERSION_MINOR 12u
#define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
#include "bpf/BpfUtils.h"