Add BPF_MAP_LOCKLESS_FOR_TEST hack for root resolver tests am: 04fb3862a9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3134333

Change-Id: Iabe8f5d24462af7be4f4bef172e6c7955a42b1ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

staticlibs/native/bpf_syscall_wrappers/include/BpfSyscallWrappers.h

@@ -135,6 +135,9 @@ int bpfGetFdMapId(const BPF_FD_TYPE map_fd);
 
 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;

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"