joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Load tcutils in ConnectivityService" am: fff2733066 am: 8e8bc3e5ee am: 00348480d5

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

Change-Id: I0098a01bed129eae2752b2d7884645969529741b
This commit is contained in:
Patrick Rohr 2022-01-27 11:24:23 +00:00 • committed by Automerger Merge Worker
commit 2fd4506f80
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
service/Android.bp
View file

@ -36,6 +36,7 @@ cc_library_shared {
stl: "libc++_static",
static_libs: [
"libnet_utils_device_common_bpfjni",
"libtcutils",
],
shared_libs: [
"liblog",

4
service/jni/com_android_net_module_util/onload.cpp
View file

@ -20,6 +20,7 @@
namespace android {
int register_com_android_net_module_util_BpfMap(JNIEnv* env, char const* class_name);
int register_com_android_net_module_util_TcUtils(JNIEnv* env, char const* class_name);
extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
JNIEnv *env;
@ -31,6 +32,9 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
if (register_com_android_net_module_util_BpfMap(env,
"com/android/connectivity/com/android/net/module/util/BpfMap") < 0) return JNI_ERR;
if (register_com_android_net_module_util_TcUtils(env,
"com/android/connectivity/com/android/net/module/util/TcUtils") < 0) return JNI_ERR;
return JNI_VERSION_1_6;
}