Fix the build problem with bpf project
Add the necessary Android.bp file and fix the compile error for the new
bpf project.
Fix the run time restart false alarm in bpf loader.
Bug: 112334572
Test: device boot and dumpsys netd show eBPF object okay, runtime
restart netd and no bpfloader error showed in logcat.
Change-Id: Iae193bda45e50b7d22479086d6403e3c4fb185c4
diff --git a/bpfloader/Android.bp b/bpfloader/Android.bp
index fe52bcf..48189e0 100644
--- a/bpfloader/Android.bp
+++ b/bpfloader/Android.bp
@@ -20,7 +20,7 @@
cc_binary {
name: "bpfloader",
- defaults: ["netd_defaults"],
+ defaults: ["bpf_defaults"],
cflags: [
"-Wall",
"-Werror",
@@ -35,6 +35,7 @@
"libbpf",
"libbase",
"liblog",
+ "libnetdbpf",
"libnetdutils",
],
srcs: [
@@ -54,5 +55,5 @@
"-Wall",
"-Werror",
],
- include_dirs: ["system/netd/libbpf/include"],
+ include_dirs: ["system/netd/libnetdbpf/include"],
}