From 0227ca298252eed7e50f2a0de60fe58dbafc45c3 Mon Sep 17 00:00:00 2001
From: Kalesh Singh <kaleshsingh@google.com>
Date: Thu, 22 May 2025 17:52:33 -0700
Subject: [PATCH] bpf: Fix double inclusions

Don't include <linux/bpf.h> if using vmlinux; as this causes
double inclusions.

Bug: 419635765
Test: manual; build and load a CO-RE BPF program
Change-Id: I4419778ea71b65ce46ac5e0e6358c33d7f78b82e
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
---
 include/defs/android_bpf_defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/defs/android_bpf_defs.h b/include/defs/android_bpf_defs.h
index 3d08b15..3f3f158 100644
--- a/include/defs/android_bpf_defs.h
+++ b/include/defs/android_bpf_defs.h
@@ -7,6 +7,7 @@
 // When using vmlinux.h, you can't use any system level headers.
 #include <vmlinux.h>
 #else
+#include <linux/bpf.h>
 #include <linux/types.h>
 #endif  // USE_VMLINUX
 #include <bpf/bpf_helpers.h>
@@ -17,7 +18,6 @@
 #undef __always_inline
 #define __always_inline __attribute__((__always_inline__))
 
-#include <linux/bpf.h>
 #include <sys/cdefs.h>
 
 #define DEFINE_BPF_MAP_BASE(the_map, TYPE, KeyType, ValueType, num_entries, gid)               \