Remove support for the RELEASE_BPF_ENABLE_LIBBPF flag

This flag has already been released, so the code path
for its disabled state can now be removed.

Test: TH
Bug: 359646531
Bug: 410982483
Change-Id: Ia211fe240e6687e00470a9fb9350a2a7ae089580
This commit is contained in:
Motomu Utsumi 2025-04-23 13:19:20 +09:00
commit e6c62af6f3
2 changed files with 3 additions and 22 deletions

View file

@ -104,10 +104,6 @@ cc_test {
rust_binary {
name: "bpfloader",
cfgs: select(release_flag("RELEASE_BPF_ENABLE_LIBBPF"), {
true: ["enable_libbpf"],
default: [],
}),
srcs: [
"bpfloader.rs",
],
@ -120,14 +116,9 @@ rust_binary {
"liblibbpf_rs",
"liblibc",
],
required: [] + select(release_flag("RELEASE_BPF_ENABLE_LIBBPF"), {
true: [
"timeInState.bpf",
],
default: [
"timeInState.o",
],
}),
required: [
"timeInState.bpf",
],
product_variables: {
debuggable: {
required: [

View file

@ -16,9 +16,6 @@
//! BPF loader for system and vendor applications
// Enable dead_code until feature flag is removed.
#![cfg_attr(not(enable_libbpf), allow(dead_code))]
use android_ids::{AID_ROOT, AID_SYSTEM};
use android_logger::AndroidLogger;
use anyhow::{anyhow, ensure};
@ -261,7 +258,6 @@ fn libbpf_worker(file_desc: &BpfFileDesc) -> Result<(), anyhow::Error> {
Ok(())
}
#[cfg(enable_libbpf)]
fn load_libbpf_progs() {
info!("Loading libbpf programs");
for file_desc in FILE_ARR {
@ -275,12 +271,6 @@ fn load_libbpf_progs() {
}
}
#[cfg(not(enable_libbpf))]
fn load_libbpf_progs() {
// Empty stub for feature flag disabled case
info!("Loading libbpf programs DISABLED");
}
fn main() {
let kmsg_fd = env::var("ANDROID_FILE__dev_kmsg").unwrap().parse::<i32>().unwrap();
// SAFETY: The init script opens this file for us