From e0a0789c53fe6d1579f699dbe8e1571276f8e3bf Mon Sep 17 00:00:00 2001
From: Neill Kapron <nkapron@google.com>
Date: Mon, 29 Jul 2024 21:42:30 +0000
Subject: [PATCH] BPF: remove duplicate cflags and update btf flags.

With the addition of the -Wall, -Werror, -Wextra cflags to the bpf soong
module as default, they are no longer necessary in the bpf definition in
Android.bp files.

Additionally, 'btf: true'  is now set by default by the build system. To counter this and maintain the existing behavior, add 'btf: false' where necessary.

Test: treehugger
Change-Id: I1961e1ee1cd1e0a83183a79671c66a6af9527f00
Signed-off-by: Neill Kapron <nkapron@google.com>
---
 progs/Android.bp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/progs/Android.bp b/progs/Android.bp
index b044eb0..78f3049 100644
--- a/progs/Android.bp
+++ b/progs/Android.bp
@@ -30,8 +30,5 @@ cc_library_headers {
 bpf {
     name: "bpfRingbufProg.o",
     srcs: ["bpfRingbufProg.c"],
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
+    btf: false,
 }