Skip to content

Commit 9465126

Browse files
committed
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: Ic5029319e82a45cdbfa6c5f4c4375dab7fea7284 Signed-off-by: Neill Kapron <nkapron@google.com>
1 parent 38cb016 commit 9465126

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

services/gpuservice/bpfprogs/Android.bp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,4 @@ package {
2424
bpf {
2525
name: "gpuMem.o",
2626
srcs: ["gpuMem.c"],
27-
btf: true,
28-
cflags: [
29-
"-Wall",
30-
"-Werror",
31-
],
3227
}

services/gpuservice/gpuwork/bpfprogs/Android.bp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ package {
1919
bpf {
2020
name: "gpuWork.o",
2121
srcs: ["gpuWork.c"],
22+
// Without btf disabled, presubmits will fail.
23+
btf: false,
2224
cflags: [
23-
"-Wall",
24-
"-Werror",
25-
"-Wformat",
2625
"-Wthread-safety",
27-
"-Wunused",
2826
"-Wunreachable-code",
2927
],
3028
}

0 commit comments

Comments
 (0)