commit 0fb433a9657e28420453a5fa9406bb2eec79dfab
author Ryan Zuklie <rzuklie@google.com> Thu Jan 05 14:22:15 2023 -0800
committer Ryan Zuklie <rzuklie@google.com> Thu Jan 05 17:57:24 2023 -0800
tree 300019a87b10c269ed7a98ea12cae41ef6e7f9b7
parent 4fba4f7a227eda7d9b1f802939c031b29599e2a5

Actually skip programs based on ignore_on

Bug: 246985031
Test: flash aosp/2374785, check loaded progs via adb shell ls
Change-Id: I0f4ba45958e4d5805b69cf9e91759d58de390b0e

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 4a2684d..faad8db 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-// This is BpfLoader v0.32
+// This is BpfLoader v0.33
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 32u
+#define BPFLOADER_VERSION_MINOR 33u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "BpfSyscallWrappers.h"
@@ -1038,6 +1038,7 @@
             (cs[i].prog_def->ignore_on_userdebug && isUserdebug())) {
             ALOGD("cs[%d].name:%s is ignored on %s builds", i, name.c_str(),
                   getBuildType().c_str());
+            continue;
         }
 
         if (unrecognized(pin_subdir)) return -ENOTDIR;