| commit | 31176381f03cbd788c71dbab47c9b39c7a717645 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Tue Jun 14 06:39:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 14 06:39:14 2022 +0000 |
| tree | 7859cc148306776d4f8098a1c23b863389186c6f | |
| parent | 8c9efd7189f7a80671f57dd9fe545f46472c4e69 [diff] | |
| parent | 4b1b4090de2a1de2c474359e2a011a51bbde385a [diff] |
TEST_BPF_MAP -> BPF_MAP_MAKE_VISIBLE_FOR_TESTING am: 8f60e5c800 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2124145 Change-Id: I1516a0a9c3866dcae4fae33291a33b22c3b4af4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h index a7720ea..0054753 100644 --- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h +++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -106,7 +106,7 @@ // Function that tries to get map from a pinned path. [[clang::reinitializes]] base::Result<void> init(const char* path); -#ifdef TEST_BPF_MAP +#ifdef BPF_MAP_MAKE_VISIBLE_FOR_TESTING // due to Android SELinux limitations which prevent map creation by anyone besides the bpfloader // this should only ever be used by test code, it is equivalent to: // .reset(createMap(type, keysize, valuesize, max_entries, map_flags)