commit d95048929cc01cad6ca200d7ff318f6daf6eb425
author Remi NGUYEN VAN <reminv@google.com> Wed Feb 02 13:03:29 2022 +0900
committer Junyu Lai <junyulai@google.com> Mon Feb 28 04:16:17 2022 +0000
tree 0228c514feaee60f1428613161d9de3fd21fc033
parent e764686003911cf5c4d8e950746b33e9eaaa2542

Add JNI stats libraries to connectivity

Add new symbols to libservice-connectivity loaded on T only, and the
framework libraries to apex and tests.

Bug: 197717846
Test: atest FrameworksNetTests
  (cherry-picked and splitting apex Android.bp to aosp/1994130)
Change-Id: Iae44344701a3267110e5cbf271120201134d59e5
Merged-In: Iae44344701a3267110e5cbf271120201134d59e5

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index eed84fe..2cfab1e 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -55,6 +55,7 @@
         "-Wthread-safety",
     ],
     srcs: [
+        ":services.connectivity-netstats-jni-sources",
         "jni/com_android_server_BpfNetMaps.cpp",
         "jni/com_android_server_connectivity_ClatCoordinator.cpp",
         "jni/com_android_server_TestNetworkService.cpp",
@@ -66,15 +67,19 @@
     static_libs: [
         "libclat",
         "libip_checksum",
+        "libmodules-utils-build",
         "libnetjniutils",
+        "libnet_utils_device_common_bpfjni",
         "libtraffic_controller",
         "netd_aidl_interface-lateststable-ndk",
     ],
     shared_libs: [
         "libbase",
+        "libcutils",
         "libnetdutils",
         "liblog",
         "libnativehelper",
+        "libnetworkstats",
     ],
     apex_available: [
         "com.android.tethering",