commit 6b26c3cd4a7c7d151ac16be5b7d79460b6bfb52a
author Maciej Żenczykowski <maze@google.com> Wed Jul 31 03:35:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 31 03:35:33 2024 +0000
tree 0c7286f712d0e4087d2b9a828f9ad8d1ea99014b
parent 3067440ae7a820155f4ff941960d45957e6ab6fe
parent 946512647e8e2444cd88e2c79ed5dcf660c9eafa

Merge "BPF: remove duplicate cflags and update btf flags." into main

services/gpuservice/bpfprogs/Android.bp

diff --git a/services/gpuservice/bpfprogs/Android.bp b/services/gpuservice/bpfprogs/Android.bp
index 680b291..a391c81 100644
--- a/services/gpuservice/bpfprogs/Android.bp
+++ b/services/gpuservice/bpfprogs/Android.bp
@@ -24,9 +24,4 @@
 bpf {
     name: "gpuMem.o",
     srcs: ["gpuMem.c"],
-    btf: true,
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
 }

services/gpuservice/gpuwork/bpfprogs/Android.bp

diff --git a/services/gpuservice/gpuwork/bpfprogs/Android.bp b/services/gpuservice/gpuwork/bpfprogs/Android.bp
index fe45c98..8e872fb 100644
--- a/services/gpuservice/gpuwork/bpfprogs/Android.bp
+++ b/services/gpuservice/gpuwork/bpfprogs/Android.bp
@@ -19,12 +19,10 @@
 bpf {
     name: "gpuWork.o",
     srcs: ["gpuWork.c"],
+    // Without btf disabled, presubmits will fail.
+    btf: false,
     cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wformat",
         "-Wthread-safety",
-        "-Wunused",
         "-Wunreachable-code",
     ],
 }