commit f7abc4378ac7f435aec8229456d18f907aaf5a9b
author Maciej Żenczykowski <maze@google.com> Thu Aug 15 15:19:58 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Thu Aug 15 15:21:15 2024 -0700
tree b2730ea0eb2a426084069c9064d1d618dfe000ec
parent acd4aa838c1b30f01a3c4be35c46726067c7bc7f

bpf: remove DEFAULT_BPF_PROG_(SELINUX_CONTEXT|PIN_SUBDIR)

This hasn't ever been useful.

Afterwards:
  git grep 'DEFAULT_BPF_PROG_(SELINUX_CONTEXT|PIN_SUBDIR)'
comes up empty

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7694d0bb3aa4e424247da7f79251412ff549ce63

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

diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
index e7da0fe..094b2e0 100644
--- a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
+++ b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
@@ -414,19 +414,10 @@
     SECTION(SECTION_NAME)                                                                \
     int the_prog
 
-#ifndef DEFAULT_BPF_PROG_SELINUX_CONTEXT
-#define DEFAULT_BPF_PROG_SELINUX_CONTEXT ""
-#endif
-
-#ifndef DEFAULT_BPF_PROG_PIN_SUBDIR
-#define DEFAULT_BPF_PROG_PIN_SUBDIR ""
-#endif
-
 #define DEFINE_BPF_PROG_KVER_RANGE_OPT(SECTION_NAME, prog_uid, prog_gid, the_prog, min_kv, max_kv, \
                                        opt)                                                        \
     DEFINE_BPF_PROG_EXT(SECTION_NAME, prog_uid, prog_gid, the_prog, min_kv, max_kv,                \
-                        BPFLOADER_MIN_VER, BPFLOADER_MAX_VER, opt,                                 \
-                        DEFAULT_BPF_PROG_SELINUX_CONTEXT, DEFAULT_BPF_PROG_PIN_SUBDIR,             \
+                        BPFLOADER_MIN_VER, BPFLOADER_MAX_VER, opt, "", "",                         \
                         LOAD_ON_ENG, LOAD_ON_USER, LOAD_ON_USERDEBUG)
 
 // Programs (here used in the sense of functions/sections) marked optional are allowed to fail