commit 82c2272b0407be8100fdb552b8477652dcd53cdd
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 03 22:41:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 03 22:41:10 2022 +0000
tree 0628e9698f567cf8bfb0e406a5cc6cc618929cac
parent c88e29c576c0024bf16afc080bcfbfca94ba6609
parent 0042853ccff5af023afb0c9e808f014d7f178305

Merge "[MS28.2] Add checkDumpPermission"

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

staticlibs/native/bpf_syscall_wrappers/Android.bp

diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/staticlibs/native/bpf_syscall_wrappers/Android.bp
index 037e10d..1a1b53c 100644
--- a/staticlibs/native/bpf_syscall_wrappers/Android.bp
+++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp
@@ -19,7 +19,7 @@
 cc_library_headers {
     name: "bpf_syscall_wrappers",
     vendor_available: false,
-    host_supported: false,
+    host_supported: true,
     native_bridge_supported: true,
     export_include_dirs: ["include"],
     cflags: [
@@ -34,6 +34,7 @@
         "com.android.tethering",
     ],
     visibility: [
+        "//frameworks/libs/net/common/native/bpf_headers",
         "//frameworks/libs/net/common/native/bpfmapjni",
         "//packages/modules/Connectivity/netd",
         "//packages/modules/Connectivity/service",

staticlibs/native/ip_checksum/Android.bp

diff --git a/staticlibs/native/ip_checksum/Android.bp b/staticlibs/native/ip_checksum/Android.bp
index d7e195d..9878d73 100644
--- a/staticlibs/native/ip_checksum/Android.bp
+++ b/staticlibs/native/ip_checksum/Android.bp
@@ -37,4 +37,10 @@
     //
     // TODO: delete libnetutils from the VNDK in T, and remove this.
     vendor_available: true,
+
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.tethering",
+        "//apex_available:platform",
+    ],
 }