LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8eb6814c2000a5a015f0656030e57a6e56ae9c8
This commit is contained in:
Maciej Żenczykowski
2021-01-14 08:03:06 +00:00
committed by Automerger Merge Worker
parent d0516927eb 539d0e27cf
commit 034c6c7d12
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Tethering/Android.bp
View File

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

3
Tethering/jni/com_android_networkstack_tethering_BpfMap.cpp
View File

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