commit d849a0cb3fcef449cf5a67a9e27667c5570e87ac
author Maciej Żenczykowski <maze@google.com> Thu Jul 25 18:24:22 2024 +0000
committer Maciej Żenczykowski <maze@google.com> Thu Jul 25 18:26:02 2024 +0000
tree 41d7cdddbbc3c671c0dc0f249802c6bea884534e
parent 29d14e7a549513aba1dc0a76d4f7142e9b13532c

bpf_progs: remove spurious 'btf: true' and Wall/Werror flags

as they are now (as of http://aosp/3196890 ) the default.

While at it enable -Wextra for Android BPF programs
This will help catch more errors at compile time.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5c2ceb078449b49d04bfda7ff3bdf5e2ca25fc95

bpf_progs/Android.bp

diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp
index 0c21c9b..ee413c5 100644
--- a/bpf_progs/Android.bp
+++ b/bpf_progs/Android.bp
@@ -38,6 +38,7 @@
     cflags: [
         "-Wall",
         "-Werror",
+        "-Wextra",
     ],
     sdk_version: "30",
     min_sdk_version: "30",
@@ -65,22 +66,12 @@
 bpf {
     name: "block.o",
     srcs: ["block.c"],
-    btf: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
     sub_dir: "net_shared",
 }
 
 bpf {
     name: "dscpPolicy.o",
     srcs: ["dscpPolicy.c"],
-    btf: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
     sub_dir: "net_shared",
 }
 
@@ -88,52 +79,29 @@
     name: "offload.o",
     srcs: ["offload.c"],
     btf: false,
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
 }
 
 bpf {
     name: "offload@mainline.o",
     srcs: ["offload@mainline.c"],
-    btf: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-DMAINLINE",
-    ],
+    cflags: ["-DMAINLINE"],
 }
 
 bpf {
     name: "test.o",
     srcs: ["test.c"],
     btf: false,
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
 }
 
 bpf {
     name: "test@mainline.o",
     srcs: ["test@mainline.c"],
-    btf: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-DMAINLINE",
-    ],
+    cflags: ["-DMAINLINE"],
 }
 
 bpf {
     name: "clatd.o",
     srcs: ["clatd.c"],
-    btf: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
     sub_dir: "net_shared",
 }
 
@@ -141,11 +109,6 @@
     // WARNING: Android T's non-updatable netd depends on 'netd' string for xt_bpf programs it loads
     name: "netd.o",
     srcs: ["netd.c"],
-    btf: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
     // WARNING: Android T's non-updatable netd depends on 'netd_shared' string for xt_bpf programs
     sub_dir: "netd_shared",
 }