diff options
| author | Maciej Żenczykowski <maze@google.com> | 2022-06-21 03:01:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-21 03:01:03 +0000 |
| commit | 3335dcff16ca9e827cbc62f1f4c86ac8a6d8d990 (patch) | |
| tree | 0fe66da76c065af45a41099eddca759063f1afe2 | |
| parent | ed8ef27e66ea878ae466d625fb2f74dc4c5eeb41 (diff) | |
| parent | 99908c25bad14dd9a3626bdd1b24c48a9ccb03b4 (diff) | |
| download | net-3335dcff16ca9e827cbc62f1f4c86ac8a6d8d990.tar.gz | |
Merge "bpf_helpers.h - add #define's for S/T bpfloader versions" into tm-dev am: 6025f4716c am: 99908c25ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18992753
Change-Id: I923b3ac06554321615ac83c3d1e63801b687a6c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/native/bpf_headers/include/bpf/bpf_helpers.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/common/native/bpf_headers/include/bpf/bpf_helpers.h b/common/native/bpf_headers/include/bpf/bpf_helpers.h index ac9f9bcb..3e260285 100644 --- a/common/native/bpf_headers/include/bpf/bpf_helpers.h +++ b/common/native/bpf_headers/include/bpf/bpf_helpers.h @@ -19,6 +19,17 @@ * * ******************************************************************************/ +// The actual versions of the bpfloader that shipped in various Android releases + +// Android P/Q/R: BpfLoader was initially part of netd, +// this was later split out into a standalone binary, but was unversioned. + +// 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 + /* For mainline module use, you can #define BPFLOADER_{MIN/MAX}_VER * before #include "bpf_helpers.h" to change which bpfloaders will * process the resulting .o file. |