commit ff22655028b27cde4cc5cb7a8460bfb59d8086c3
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 17 23:03:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 17 23:03:39 2019 +0000
tree 36c7d292c8cc6139dea2f4f541870adc945cdf3c
parent fe5e7aa3144b2237a4f9bfc3d4362f8145c19379
parent b20d28df6a1f49da7038522674c5356fea2bcacf

Merge "Skip bpf object loading on unsupported devices"

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 35b84de..01c02cc 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -92,8 +92,10 @@
         return 0;
     }
 
-    // Load all ELF objects, create programs and maps, and pin them
-    loadAllElfObjects();
+    if (android::bpf::getBpfSupportLevel() != android::bpf::BpfLevel::NONE) {
+        // Load all ELF objects, create programs and maps, and pin them
+        loadAllElfObjects();
+    }
 
     if (android::base::SetProperty("bpf.progs_loaded", "1") == false) {
         ALOGE("Failed to set bpf.progs_loaded property\n");