| commit | cfcd7fa8f09b9827dd2341ff7bff1c9944f0b5d9 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Sat Jun 15 03:47:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 15 03:47:17 2024 +0000 |
| tree | 318424348ee478955d723257de191bc795948a4d | |
| parent | 106c5dc1bf55ad142a08013b9837384494672d28 [diff] | |
| parent | 9846522b6a25148519c2ee718e607897927fd836 [diff] |
Add BPF_MAP_LOCKLESS_FOR_TEST hack for root resolver tests am: 04fb3862a9 am: 9846522b6a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3134333 Change-Id: If1c860de7f3d71072261d5ef59e2773404411ee5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h b/staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h index eed4fd6..5bb3100 100644 --- a/staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h +++ b/staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h
@@ -135,6 +135,9 @@ inline int bpfLock(int fd, short type) { if (fd < 0) return fd; // pass any errors straight through +#ifdef BPF_MAP_LOCKLESS_FOR_TEST + return fd; +#endif #ifdef BPF_FD_JUST_USE_INT int mapId = bpfGetFdMapId(fd); int saved_errno = errno;
diff --git a/tests/native/utilities/firewall.h b/tests/native/utilities/firewall.h index b3d69bf..a5cb0b9 100644 --- a/tests/native/utilities/firewall.h +++ b/tests/native/utilities/firewall.h
@@ -18,6 +18,7 @@ #pragma once #include <android-base/thread_annotations.h> +#define BPF_MAP_LOCKLESS_FOR_TEST #include <bpf/BpfMap.h> #include "netd.h"