commit 4bc5fd7ad392f520bc6c1d1f87ea45fbab3a534e
author Maciej Żenczykowski <maze@google.com> Wed Oct 26 23:08:16 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 26 23:08:16 2022 +0000
tree 7f430f3f15ebdcfea358acdd73c772df76fc6ce2
parent 9c549c0d53b58d3b8bcd2be31def76b833bbaa95
parent 203d5e0dcd6c735da39248c3ee13a5e3e8c662e4

Merge "trivialize SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED"

staticlibs/native/bpf_headers/include/bpf/BpfUtils.h

diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h b/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h
index 0489a4c..157f210 100644
--- a/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h
+++ b/staticlibs/native/bpf_headers/include/bpf/BpfUtils.h
@@ -121,11 +121,10 @@
             GTEST_SKIP() << "Skip: bpf is not supported.";  \
     } while (0)
 
-#define SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED                               \
-    do {                                                                 \
-        if (!android::bpf::isAtLeastKernelVersion(4, 14, 0))             \
-            GTEST_SKIP() << "Skip: extended bpf feature not supported."; \
-    } while (0)
+// Only used by tm-mainline-prod's system/netd/tests/bpf_base_test.cpp
+// but platform and platform tests aren't expected to build/work in tm-mainline-prod
+// so we can just trivialize this
+#define SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED
 
 #define SKIP_IF_XDP_NOT_SUPPORTED                           \
     do {                                                    \