support android-15.0.0_r1

This commit is contained in:
Ziyang Zhou
2024-09-05 20:42:56 +08:00
parent 4c18f31f2c
commit 142755f1b4
22 changed files with 989 additions and 0 deletions

View File

@@ -0,0 +1,24 @@
From da6a3860532462775369a3ef376bce0e278ebfc8 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Thu, 5 Sep 2024 19:11:19 +0800
Subject: [PATCH 2/2] ignore nativeSynchronizeKernelRCU error
---
.../native/bpfmapjni/com_android_net_module_util_BpfMap.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp b/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp
index 1923ceb..3c143f5 100644
--- a/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp
+++ b/staticlibs/native/bpfmapjni/com_android_net_module_util_BpfMap.cpp
@@ -141,7 +141,6 @@ static void com_android_net_module_util_BpfMap_nativeSynchronizeKernelRCU(JNIEnv
const int pfSocket = socket(AF_KEY, SOCK_RAW | SOCK_CLOEXEC, PF_KEY_V2);
if (pfSocket < 0) {
- jniThrowErrnoException(env, "nativeSynchronizeKernelRCU:socket", errno);
return;
}
--
2.45.1