commit 994bc4b8597c6452988f99da84369b0012c6ea25
author Maciej Żenczykowski <maze@google.com> Wed Jul 31 03:56:08 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 31 03:56:08 2024 +0000
tree aa0b51ea1b1cd4c0da6f5572dda1e6f227d5cac8
parent c16f18d6da923c5939de9151ff734d8ee3feea80
parent 245acbc0820c55295a5ab904fdd3a9fdd0bd316f

Merge "bpf_progs: remove spurious 'btf: true' and Wall/Werror flags" into main am: 245acbc082

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3195574

Change-Id: Iec60c7a66545200ab6aa4838fd4473eb63e32206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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",
 }