commit d08dc25a249bc6d12eb6f862462586c7a5ba4e84
author Maciej Żenczykowski <maze@google.com> Wed Jul 31 04:15:13 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 31 04:15:13 2024 +0000
tree 4c5235989d2e469286624fa9c850226838b7af5d
parent 9312aa2b0e20d200658eced1a3697ff839e1991f
parent 3ac6aa62b1a902220696ef630fb477f3a0f582a0

Merge "BPF: remove duplicate cflags and update btf flags." into main am: 6b26c3cd4a am: 3ac6aa62b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3196910

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

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