commit 400702b6bbbc3e7ec0949d6ab21fcf3a10e1989e
author Hungming Chen <nuccachen@google.com> Wed Jan 13 13:47:48 2021 +0800
committer Hungming Chen <nuccachen@google.com> Wed Jan 13 14:31:28 2021 +0800
tree f18b0c0a4e1285671b4b2c47d504dab40769a38a
parent 99f6c312ef4539fc46b7a5ecd484af7d56cff556

Use header module bpf_syscall_wrappers

Use the versioned header library instead of just including
the header files.

Test: atest BpfMapTest
Change-Id: Icf23dcdc051a4ead6a7c6e925159cdc27f49eac2

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 {