commit 9011ee638f475ef169c7083852f1f40a0a053828
author Neill Kapron <nkapron@google.com> Fri Sep 13 23:03:36 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 13 23:03:36 2024 +0000
tree 28c64b989b64cc7bc29bb2a88efb7acb9c8b2daa
parent ce4d3e8f2af77218a8c22246646b43d8e1d7a5dc
parent 4ac73aa1b0278e014e61b494e719291406d7ca03

BPF: rename bpf_defaults to bpf_cc_defaults am: 19a5ec2f66 am: 4ac73aa1b0

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/3267895

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

Android.bp

diff --git a/Android.bp b/Android.bp
index b8cd7b3..9a17183 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,10 +16,11 @@
 }
 
 cc_defaults {
-    name: "bpf_defaults",
+    name: "bpf_cc_defaults",
     cflags: [
         "-Wall",
         "-Werror",
+        "-Wextra",
         "-Wnullable-to-nonnull-conversion",
         "-Wthread-safety",
         "-Wunused-parameter",

loader/Android.bp

diff --git a/loader/Android.bp b/loader/Android.bp
index 4f66cdf..1e68f92 100644
--- a/loader/Android.bp
+++ b/loader/Android.bp
@@ -37,7 +37,6 @@
             },
         },
     },
-
     shared_libs: [
         "libbase",
         "libutils",
@@ -50,13 +49,7 @@
         "bpf_headers",
     ],
     export_include_dirs: ["include"],
-
-    defaults: ["bpf_defaults"],
-    cflags: [
-        "-Werror",
-        "-Wall",
-        "-Wextra",
-    ],
+    defaults: ["bpf_cc_defaults"],
 }
 
 rust_bindgen {
@@ -88,10 +81,8 @@
     srcs: [
         "BpfLoadTest.cpp",
     ],
-    defaults: ["bpf_defaults"],
+    defaults: ["bpf_cc_defaults"],
     cflags: [
-        "-Wall",
-        "-Werror",
         "-Wno-error=unused-variable",
     ],
     static_libs: [