commit efc98946854f0653ffe3b0ba576f7745944e7bd6
author Maciej Żenczykowski <maze@google.com> Mon Mar 10 21:45:31 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 10 21:45:31 2025 -0700
tree 28cae7a50b9d720c2c6a32b2fe28605c083414af
parent 0307ef585a962fa49ce73938c3daf945d05bdd96
parent 73b2196ef5827fd4678c26d8dde609fabb7592ee

platform BpfLoader: drop support for uprobestats am: c799e7610f am: 73b2196ef5

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/3534045

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

loader/Loader.cpp

diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index 09e2e17..89bdb80 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -882,10 +882,6 @@
         BPF_PROG_TYPE_SOCKET_FILTER,
 };
 
-constexpr bpf_prog_type kUprobestatsAllowedProgTypes[] = {
-        BPF_PROG_TYPE_KPROBE,
-};
-
 // see b/162057235. For arbitrary program types, the concern is that due to the lack of
 // SELinux access controls over BPF program attachpoints, we have no way to control the
 // attachment of programs to shared resources (or to detect when a shared resource
@@ -909,13 +905,6 @@
                 .allowedProgTypes = kMemEventsAllowedProgTypes,
                 .allowedProgTypesLength = arraysize(kMemEventsAllowedProgTypes),
         },
-        // uprobestats
-        {
-                .dir = "/system/etc/bpf/uprobestats/",
-                .prefix = "uprobestats/",
-                .allowedProgTypes = kUprobestatsAllowedProgTypes,
-                .allowedProgTypesLength = arraysize(kUprobestatsAllowedProgTypes),
-        },
         // Vendor operating system
         {
                 .dir = "/vendor/etc/bpf/",