commit 15d8ebee4159b0eb867b1f296ec789484da0c26c
author Maciej Żenczykowski <maze@google.com> Thu Dec 23 22:41:21 2021 -0800
committer Maciej Żenczykowski <maze@google.com> Tue Dec 28 17:56:27 2021 -0800
tree 8fcb1ec2166aec3669f25219c213943ae7acfbb2
parent aa4d8483de13a6586e84c9a16904d8edfcb1fca5

bpf_connectivity_headers -> bpf_headers -> bpf_syscall_wrappers

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Idf158fa33670522b43e34c67a77087648b8b97a4

staticlibs/native/bpf_headers/Android.bp

diff --git a/staticlibs/native/bpf_headers/Android.bp b/staticlibs/native/bpf_headers/Android.bp
index 4ec4d58..06ba1b0 100644
--- a/staticlibs/native/bpf_headers/Android.bp
+++ b/staticlibs/native/bpf_headers/Android.bp
@@ -18,14 +18,17 @@
 
 cc_library_headers {
     name: "bpf_headers",
-    vendor_available: true,
+    vendor_available: false,
     host_supported: true,
     native_bridge_supported: true,
+    header_libs: ["bpf_syscall_wrappers"],
+    export_header_lib_headers: ["bpf_syscall_wrappers"],
     export_include_dirs: ["include"],
     cflags: [
         "-Wall",
         "-Werror",
     ],
+    sdk_version: "30",
     min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
@@ -40,6 +43,7 @@
         "//frameworks/native/services/gpuservice/gpumem",
         "//frameworks/native/services/gpuservice/tests/unittests",
         "//frameworks/native/services/gpuservice/tracing",
+        "//packages/modules/Connectivity/bpf_progs",
         "//packages/modules/Connectivity/netd",
         "//packages/modules/Connectivity/tests/unit/jni",
         "//packages/modules/DnsResolver/tests",