Merge "Add a warning to bpfloader version number." am: 8d8e166e46 am: 33fe2fd505
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2396892
Change-Id: I5fba497ddd468d3f2b49bf1bbbd2f932cefcea07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index faad8db..fddb1a7 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -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"