| commit | a6301fd09980306d3573508fcb4edbf94e759ba7 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Aug 16 03:16:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 16 03:16:10 2024 +0000 |
| tree | bfec62672395d111f330f380424edccbf92e424d | |
| parent | 0e9c9e06a6a9b4c76ce27de6e4f219fe54cd4bad [diff] | |
| parent | fac81f1f72c366421aa00d5bfb0f7a4ee23f4adf [diff] |
bpf: eliminate DEFAULT_BPFLOADER_(MIN|MAX)_VER am: fac81f1f72 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3221270 Change-Id: I5165a95437f0ad45bfb41d1b4503d366a52c0e53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h index 094b2e0..9069038 100644 --- a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h +++ b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
@@ -71,11 +71,11 @@ * In which case it's just best to use the default. */ #ifndef BPFLOADER_MIN_VER -#define BPFLOADER_MIN_VER BPFLOADER_PLATFORM_VERSION +#define BPFLOADER_MIN_VER BPFLOADER_PLATFORM_VERSION // inclusive, ie. >= #endif #ifndef BPFLOADER_MAX_VER -#define BPFLOADER_MAX_VER DEFAULT_BPFLOADER_MAX_VER +#define BPFLOADER_MAX_VER 0x10000u // exclusive, ie. < v1.0 #endif /* place things in different elf sections */
diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h b/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h index 0ac4474..2d6736c 100644 --- a/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h +++ b/staticlibs/native/bpf_headers/include/bpf/bpf_map_def.h
@@ -42,10 +42,6 @@ * * ******************************************************************************/ -// These are the values used if these fields are missing -#define DEFAULT_BPFLOADER_MIN_VER 0u // v0.0 (this is inclusive ie. >= v0.0) -#define DEFAULT_BPFLOADER_MAX_VER 0x10000u // v1.0 (this is exclusive ie. < v1.0) - /* * The bpf_{map,prog}_def structures are compiled for different architectures. * Once by the BPF compiler for the BPF architecture, and once by a C++