commit 9daf0afa3db7db5a683c81e321c0bc963611afc0
author Maciej Żenczykowski <maze@google.com> Fri Sep 13 22:15:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 13 22:15:27 2024 +0000
tree ffcc544ea20b8a7e8792eff19d995696cdd36b4a
parent 6a7e703f17bd17aa7145391c5d8ead82d1ac2d44
parent 661ae85eb251faa1d679c23d36d7fb627a26d529

Merge "BPF: rename bpf_defaults to bpf_cc_defaults" into main

bpf/headers/Android.bp

diff --git a/bpf/headers/Android.bp b/bpf/headers/Android.bp
index d55584a..aaf8d8d 100644
--- a/bpf/headers/Android.bp
+++ b/bpf/headers/Android.bp
@@ -48,11 +48,10 @@
         "BpfMapTest.cpp",
         "BpfRingbufTest.cpp",
     ],
-    defaults: ["bpf_defaults"],
+    defaults: ["bpf_cc_defaults"],
     cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wno-error=unused-variable",
+        "-Wno-unused-variable",
+        "-Wno-sign-compare",
     ],
     header_libs: ["bpf_headers"],
     static_libs: ["libgmock"],

bpf/loader/Android.bp

diff --git a/bpf/loader/Android.bp b/bpf/loader/Android.bp
index b8c0ce7..b08913a 100644
--- a/bpf/loader/Android.bp
+++ b/bpf/loader/Android.bp
@@ -33,12 +33,7 @@
 cc_binary {
     name: "netbpfload",
 
-    defaults: ["bpf_defaults"],
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wthread-safety",
-    ],
+    defaults: ["bpf_cc_defaults"],
     sanitize: {
         integer_overflow: true,
     },