From aa8717db443a5d7eac667ffb994b4ee01ecfa66f Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Mon, 25 Aug 2025 20:29:38 +0900
Subject: [PATCH] NetBpfLoad: use macro for mainline beta flag

Flag: com.android.tethering.readonly.flags.use_libbpf
Bug: 428792764
Test: Enable/Disable flag, boot, adb shell logcat
Change-Id: I40e6124f6c96cf09ce50f38d786f15847ec6f69d
---
 bpf/loader/NetBpfLoad.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 667e7847a9..a94bb65ec3 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -81,7 +81,6 @@ using android::base::Split;
 using android::base::StartsWith;
 using android::base::Tokenize;
 using android::base::unique_fd;
-using com::android::tethering::readonly::flags::use_libbpf;
 using std::ifstream;
 using std::ios;
 using std::optional;
@@ -1393,11 +1392,16 @@ static bool loadObject(const unsigned int bpfloader_ver,
     return true;
 }
 
+#ifndef COM_ANDROID_TETHERING_READONLY_FLAGS_USE_LIBBPF
+#error "COM_ANDROID_TETHERING_READONLY_FLAGS_USE_LIBBPF must be defined"
+#endif
+#define USE_LIBBPF COM_ANDROID_TETHERING_READONLY_FLAGS_USE_LIBBPF
+
 #define APEXROOT "/apex/com.android.tethering"
 #define BPFROOT APEXROOT "/etc/bpf/mainline/"
 
 static bool loadAllObjects(const unsigned int bpfloader_ver) {
-    bool libbpf = !bpfCmdFixupIsNeeded && (isAtLeast25Q3 || use_libbpf());
+    bool libbpf = !bpfCmdFixupIsNeeded && (isAtLeast25Q3 || USE_LIBBPF);
     if (!loadObject(bpfloader_ver, BPFROOT "offload.o")) return false;
     if (!loadObject(bpfloader_ver, BPFROOT "test.o", libbpf)) return false;
     if (isAtLeastT) {