commit 7e9fa37c83a07d5a83af2f4fb5891df4ad20985a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 14 22:56:58 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Sep 14 22:56:58 2024 +0000
tree 97f9c342744657d157fea73ea7994f43c12356ba
parent 462643e81ddf6078143c814e22e9ad9f993cba88
parent 10c1b8980d3f85e2f0982698a1fc28174269e0be

Snap for 12369952 from 10c1b8980d3f85e2f0982698a1fc28174269e0be to 24Q4-release

Change-Id: If0d3f8a15c1f35cc3bce1c06632d03e815d4f1cf

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