From 8b3ea0a2747e19378a2f0663682ee141f6b6acce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Tue, 15 Jul 2025 23:14:37 -0700
Subject: [PATCH] simplify libbpf_android.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test: TreeHugger
Flag: EXEMPT trivial
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I39f73afef65b22b1d275742758aff7745991d9e7
---
 loader/Loader.cpp               |  7 +++++++
 loader/include/libbpf_android.h | 35 ++-------------------------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index af684c5..f0c00b5 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -817,6 +817,13 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const
     return 0;
 }
 
+struct Location {
+    const char* const dir = "";
+    const char* const prefix = "";
+    const bpf_prog_type* allowedProgTypes = nullptr;
+    size_t allowedProgTypesLength = 0;
+};
+
 int loadProg(const char* elfPath, bool* isCritical, const Location& location) {
     vector<char> license;
     vector<char> critical;
diff --git a/loader/include/libbpf_android.h b/loader/include/libbpf_android.h
index 9fb30b5..706c0e8 100644
--- a/loader/include/libbpf_android.h
+++ b/loader/include/libbpf_android.h
@@ -17,39 +17,8 @@
 
 #pragma once
 
-#ifdef __cplusplus
-
-#include <linux/bpf.h>
-
-#include <fstream>
-
-namespace android {
-namespace bpf {
-
-struct Location {
-    const char* const dir = "";
-    const char* const prefix = "";
-    const bpf_prog_type* allowedProgTypes = nullptr;
-    size_t allowedProgTypesLength = 0;
-};
-
-// BPF loader implementation. Loads an eBPF ELF object
-int loadProg(const char* elfPath, bool* isCritical, const Location &location = {});
-
-// Exposed for testing
-unsigned int readSectionUint(const char* name, std::ifstream& elfFile, unsigned int defVal);
-
-}  // namespace bpf
-}  // namespace android
-
-extern "C" {
-#else // __cplusplus
-#define __noreturn
-#endif // __cplusplus
-
 // The C++ portion of the BpfLoader is exposed as a terminal function.
-__noreturn void vendorBpfLoader();
-
 #ifdef __cplusplus
-}  // extern C
+extern "C" __noreturn
 #endif
+void vendorBpfLoader();