From 058256633680813ab0d9439a81aa50b6b3448ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Fri, 20 Jan 2023 13:00:24 +0000 Subject: [PATCH] Add a warning to bpfloader version number. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Driven by GTS failure seen in b/265383327 Test: N/A Signed-off-by: Maciej Żenczykowski Change-Id: Ic45c1f8c0ef38a379981bf29c44358ad39c3a90b --- libbpf_android/Loader.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 #include -// 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"