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

Merge "Add a warning to bpfloader version number." am: 8d8e166e46

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

Change-Id: I34b819b156c9b548221727ffbeaa0bb97f525e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-01-30 19:18:38 +00:00 committed by Automerger Merge Worker
commit 33fe2fd505
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libbpf_android/Loader.cpp
View file

@ -30,9 +30,13 @@
#include <sys/wait.h>
#include <unistd.h>
// This is BpfLoader v0.33
// This is BpfLoader v0.34
// WARNING: If you ever hit cherrypick conflicts here you're doing it wrong:
// You are NOT allowed to cherrypick bpfloader related patches out of order.
// (indeed: cherrypicking is probably a bad idea and you should merge instead)
// Mainline supports ONLY the published versions of the bpfloader for each Android release.
#define BPFLOADER_VERSION_MAJOR 0u
#define BPFLOADER_VERSION_MINOR 33u
#define BPFLOADER_VERSION_MINOR 34u
#define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
#include "BpfSyscallWrappers.h"