commit e258c5913d10abf145728a9d02a1d63db8a9b656
author Patrick Rohr <prohr@google.com> Tue Jan 18 16:34:59 2022 +0100
committer Patrick Rohr <prohr@google.com> Thu Jan 27 09:07:36 2022 +0100
tree ca9af323f39c3dba08459d7f8396624f9944971f
parent c7231f3e79943effd3cb2c45b206d623f478dd08

Load tcutils in ConnectivityService

Bug: 157552970
Test: TreeHugger
Change-Id: Ic2204260e822b082f58e5f01e5da8dad879ab22f

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index d1a9004..bf321e6 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -36,6 +36,7 @@
     stl: "libc++_static",
     static_libs: [
         "libnet_utils_device_common_bpfjni",
+        "libtcutils",
     ],
     shared_libs: [
         "liblog",

service/jni/com_android_net_module_util/onload.cpp

diff --git a/service/jni/com_android_net_module_util/onload.cpp b/service/jni/com_android_net_module_util/onload.cpp
index 1d17622..07ae31c 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 @@
     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;
 }