From e258c5913d10abf145728a9d02a1d63db8a9b656 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Tue, 18 Jan 2022 16:34:59 +0100 Subject: [PATCH] Load tcutils in ConnectivityService Bug: 157552970 Test: TreeHugger Change-Id: Ic2204260e822b082f58e5f01e5da8dad879ab22f --- service/Android.bp | 1 + service/jni/com_android_net_module_util/onload.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/service/Android.bp b/service/Android.bp index d1a9004106..bf321e6419 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -36,6 +36,7 @@ cc_library_shared { stl: "libc++_static", static_libs: [ "libnet_utils_device_common_bpfjni", + "libtcutils", ], shared_libs: [ "liblog", diff --git a/service/jni/com_android_net_module_util/onload.cpp b/service/jni/com_android_net_module_util/onload.cpp index 1d17622f44..07ae31c623 100644 --- a/service/jni/com_android_net_module_util/onload.cpp +++ b/service/jni/com_android_net_module_util/onload.cpp @@ -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; }