From 1f5cd4b9a1dc73a7334b6d1459f79b257b336cbf Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Fri, 13 Jun 2025 12:57:46 +0900
Subject: [PATCH] Use platform bpf_helpers.h and bpf_map_def.h for platform
 bpfloader

Platform BPF programs rely on platform bpf_helpers.h and bpf_map_def.h.
To ensure consistency and correctness, the loader must use these platform
headers instead of those from p/m/Connectivity.

Bug: 424341374
Test: TH
Change-Id: Id5f1bc8fdd29e54c28a3ec9e01f6a9292f6bb9e1
---
 Android.bp        | 5 +++++
 loader/Android.bp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/Android.bp b/Android.bp
index fd5b5cf..b095d0e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,6 +38,11 @@ cc_library_headers {
     export_include_dirs: ["include/defs"],
 }
 
+cc_library_headers {
+    name: "bpf_prog_platform_headers",
+    export_include_dirs: ["include/bpf"],
+}
+
 cc_defaults {
     name: "bpf_cc_defaults",
     cflags: [
diff --git a/loader/Android.bp b/loader/Android.bp
index ab8ed49..9f39425 100644
--- a/loader/Android.bp
+++ b/loader/Android.bp
@@ -44,9 +44,11 @@ cc_library {
     ],
     header_libs: [
         "bpf_headers",
+        "bpf_prog_platform_headers",
     ],
     export_header_lib_headers: [
         "bpf_headers",
+        "bpf_prog_platform_headers",
     ],
     export_include_dirs: ["include"],
     defaults: ["bpf_cc_defaults"],