From 9ee26f72eb8d0e81a15a17a56c23ba177e053da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Wed, 26 Apr 2023 23:16:49 +0000 Subject: [PATCH] Remove mentions of bploader versions between S and T MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (they're only of historical interest at this point) Test: TreeHugger Signed-off-by: Maciej Żenczykowski Change-Id: I0e52efda62626091c3023c5fd3622ffcdcd00ee1 --- staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h index 4939483a32..eaa39946bd 100644 --- a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h +++ b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h @@ -27,13 +27,6 @@ // Android S / 12 (api level 31) - added 'tethering' mainline eBPF support #define BPFLOADER_S_VERSION 2u -// Android T / 13 Beta 3 (api level 33) - added support for 'netd_shared' -#define BPFLOADER_T_BETA3_VERSION 13u - -// v0.18 added support for shared and pindir, but still ignores selinux_content -// v0.19 added support for selinux_content along with the required selinux changes -// and should be available starting with Android T Beta 4 -// // Android T / 13 (api level 33) - support for shared/selinux_context/pindir #define BPFLOADER_T_VERSION 19u @@ -225,7 +218,7 @@ static void (*bpf_ringbuf_submit_unsafe)(const void* data, __u64 flags) = (void* #ifdef THIS_BPF_PROGRAM_IS_FOR_TEST_PURPOSES_ONLY #define BPF_MAP_ASSERT_OK(type, entries, mode) -#elif BPFLOADER_MIN_VER >= BPFLOADER_T_BETA3_VERSION +#elif BPFLOADER_MIN_VER >= BPFLOADER_T_VERSION #define BPF_MAP_ASSERT_OK(type, entries, mode) #else #define BPF_MAP_ASSERT_OK(type, entries, mode) \