[NETD-BPF#14] Move BPF map definition and utils to frameworks/libs/net/
Move BPF map definition and utilities to a common place that easy to be
referenced from both mainline module and platform code.
Bug: 202086915
Test: m; flash; boot
Test: cd system/netd/ && atest
Test: cd packages/modules/Connectivity && atest
Test: m gpuservice_unittest libtimeinstate_test bpf_module_test
CtsAppOpsTestCases libbpf_load_test VtsBootconfigTest
vts_test_binary_bpf_module bpf_benchmark libbpf_load_test
libbpf_android_test
Change-Id: Ib15cf78c2da97bff835fb406c866676eec77c013
diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
index b3ab84c..7ab4c47 100644
--- a/libbpf_android/Android.bp
+++ b/libbpf_android/Android.bp
@@ -61,9 +61,13 @@
"libbpf",
],
header_libs: [
- "libbpf_android_headers"
+ "bpf_map_utils",
+ "libbpf_android_headers",
],
- export_header_lib_headers: ["libbpf_android_headers"],
+ export_header_lib_headers: [
+ "libbpf_android_headers",
+ "bpf_map_utils",
+ ],
export_shared_lib_headers: ["libbpf"],
local_include_dirs: ["include"],
@@ -77,6 +81,7 @@
cc_test {
name: "libbpf_load_test",
+ header_libs: ["bpf_map_utils"],
srcs: [
"BpfLoadTest.cpp",
],