commit da5d7ec6a70f383bcd788b8e6e19aa4fbb25a4df
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 20 03:38:42 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 20 03:38:42 2021 +0000
tree 8856b2e40654686083ae50dddc87e27e3f4edbfa
parent 71e977fb0dcb990fb85f4a6f527ec73f4ea7788e
parent 2337d47db3fac3b42fd8c94438df1ee00c77862f

Merge changes Ic378d0e5,Ib3a8696a

* changes:
  remove unused enum value BpfLevel::NONE
  remove unused function BpfLevelToString()

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 43bd1da..e61f460 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -669,8 +669,6 @@
 }
 
 void waitForProgsLoaded() {
-    if (!android::bpf::isBpfSupported()) return;
-
     if (waitSecondsForProgsLoaded(5)) return;
     if (waitSecondsForProgsLoaded(10)) return;
     if (waitSecondsForProgsLoaded(20)) return;

libbpf_android/include/bpf/BpfUtils.h

diff --git a/libbpf_android/include/bpf/BpfUtils.h b/libbpf_android/include/bpf/BpfUtils.h
index 50f2090..0843339 100644
--- a/libbpf_android/include/bpf/BpfUtils.h
+++ b/libbpf_android/include/bpf/BpfUtils.h
@@ -57,19 +57,6 @@
     return true;
 }
 
-#define SKIP_IF_BPF_NOT_SUPPORTED                                                    \
-    do {                                                                             \
-        if (!android::bpf::isBpfSupported()) {                                       \
-            GTEST_LOG_(INFO) << "This test is skipped since bpf is not available\n"; \
-            return;                                                                  \
-        }                                                                            \
-    } while (0)
-
-#define SKIP_IF_BPF_SUPPORTED                       \
-    do {                                            \
-        if (android::bpf::isBpfSupported()) return; \
-    } while (0)
-
 #define SKIP_IF_EXTENDED_BPF_NOT_SUPPORTED                                                \
     do {                                                                                  \
         if (android::bpf::getBpfSupportLevel() < android::bpf::BpfLevel::EXTENDED_4_14) { \