commit f714f1b116824b3cc89e1645d6875745dfbe32fb
author Patrick Rohr <prohr@google.com> Wed Jan 12 21:06:50 2022 +0100
committer Patrick Rohr <prohr@google.com> Thu Jan 13 22:24:29 2022 +0100
tree b70b524ee31ce68b25668488c36de9b5524fedad
parent 299a85e4f5d7b73aa07198f1691d7b788ae6a7fd

Move BpfUtils -- add JNI wrapper for libtcutils

This CL adds the copied JNI wrappers for tcutils.

Bug: 202086915
Bug: 157552970
Test: atest TetheringTests
Change-Id: Ib3f8b24a12a18f1ba64fd17304274c4dba37fc47

staticlibs/native/bpfmapjni/Android.bp

diff --git a/staticlibs/native/bpfmapjni/Android.bp b/staticlibs/native/bpfmapjni/Android.bp
index b7af22d..8d3c90b 100644
--- a/staticlibs/native/bpfmapjni/Android.bp
+++ b/staticlibs/native/bpfmapjni/Android.bp
@@ -18,7 +18,10 @@
 
 cc_library_static {
     name: "libnet_utils_device_common_bpfjni",
-    srcs: ["com_android_net_module_util_BpfMap.cpp"],
+    srcs: [
+        "com_android_net_module_util_BpfMap.cpp",
+        "com_android_net_module_util_TcUtils.cpp",
+    ],
     header_libs: [
         "bpf_syscall_wrappers",
         "jni_headers",
@@ -27,6 +30,9 @@
         "liblog",
         "libnativehelper_compat_libc++",
     ],
+    static_libs: [
+        "libtcutils",
+    ],
     cflags: [
         "-Wall",
         "-Werror",