Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf am: 034c6c7d12 am: 8cd034fd8e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1549715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf71b838bb4f2626e277351ea729a58b215551f6

Tethering/Android.bp

@@ -60,10 +60,7 @@ cc_library {
         "com.android.tethering",
     ],
     min_sdk_version: "30",
-    include_dirs: [
-        // TODO: use the libbpf_android_headers instead of just including the header files.
-        "system/bpf/libbpf_android/include/",
-    ],
+    header_libs: ["bpf_syscall_wrappers"],
     srcs: [
         "jni/*.cpp",
     ],

Tethering/jni/com_android_networkstack_tethering_BpfMap.cpp

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <linux/bpf.h>
 #include <errno.h>
 #include <jni.h>
 #include <nativehelper/JNIHelp.h>
@@ -24,7 +23,7 @@
 #include "nativehelper/scoped_utf_chars.h"
 
 #define BPF_FD_JUST_USE_INT
-#include "bpf/BpfUtils.h"
+#include "BpfSyscallWrappers.h"
 
 namespace android {