| commit | da8416ca6444c6f54a842bfa6ecf085f114570a4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jul 22 00:14:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 22 00:14:40 2022 +0000 |
| tree | 94cdd41224bb94395f84dc815df24d8b3a00a906 | |
| parent | fbc7689b26549976e40f445fa3ba7cf982acbf2b [diff] | |
| parent | fc2fc757674d820cec3f2163b3eea24f850c9e04 [diff] |
Merge changes from topic "b239807354" am: a2fd7dc3e8 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2163076 Change-Id: Ie8721ff4f3bd700d3f8f855fc934c0125625f25f 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 236318d..a21e685 100644 --- a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h +++ b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
@@ -192,8 +192,8 @@ #ifndef DEFAULT_BPF_MAP_UID #define DEFAULT_BPF_MAP_UID AID_ROOT -#elif BPFLOADER_MIN_VER < 21u -#error "Bpf Map UID must be left at default of AID_ROOT for BpfLoader prior to v0.21" +#elif BPFLOADER_MIN_VER < 28u +#error "Bpf Map UID must be left at default of AID_ROOT for BpfLoader prior to v0.28" #endif #define DEFINE_BPF_MAP_UGM(the_map, TYPE, KeyType, ValueType, num_entries, usr, grp, md) \