commit 8cd034fd8e8a1848882bb3ad43b150a137605a62
author Maciej Żenczykowski <maze@google.com> Thu Jan 14 08:27:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 14 08:27:24 2021 +0000
tree e0f9dad115fee11d8c4faf08b1db97d69571daa3
parent abd7330b9f96ec74c0bd5bc82c86b2b6985d0575
parent 034c6c7d1216ce5a855ab5d7a18eb3e6c7b5fd59

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3a1ff6efba86ef3fb3d554b1807448aa56b4956

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 5edcfe3..761e098 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -60,10 +60,7 @@
         "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

diff --git a/Tethering/jni/com_android_networkstack_tethering_BpfMap.cpp b/Tethering/jni/com_android_networkstack_tethering_BpfMap.cpp
index 64f7dcf..eadc210 100644
--- a/Tethering/jni/com_android_networkstack_tethering_BpfMap.cpp
+++ b/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 {