tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move net_shared bpf programs into net_shared subdirectory

Browse source 
This is needed due to the other half of this topic getting into tm-dev via automerger via sc-mainline-prod
Also this topic was always meant for T.

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2071267

Test: manual
Bug: 218408035
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Merged-In: Id5ef7f3b119743ef26b062068756c4e0f754e694
Change-Id: I6ffab207294946357f3a97685d3eacc75b724e89
This commit is contained in:
Maciej Żenczykowski 2022-04-23 09:35:28 +00:00
parent c8b85f9876
commit da4f92c3be
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bpfloader/BpfLoader.cpp
View file

@ -77,7 +77,7 @@ const Location locations[] = {
// Tethering mainline module: netd, clatd, ...etc // Tethering mainline module: netd, clatd, ...etc
{ {
.dir = "/apex/com.android.tethering/etc/bpf/net_shared/", .dir = "/apex/com.android.tethering/etc/bpf/net_shared/",
.prefix = "", .prefix = "net_shared/",
}, },
// Core operating system // Core operating system
{ {

4
libbpf_android/Loader.cpp
View file

@ -30,9 +30,9 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
// This is BpfLoader v0.10 // This is BpfLoader v0.12
#define BPFLOADER_VERSION_MAJOR 0u #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) #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"