Merge libtraffic_controller_jni into libservice-connectivity

There is not really a point to separate these two as they are all used
in ConnectivityService.
As a future TODO, we might want to rename libservice-connectivity to
libcom_android_server_jni to be more inline with the jarjar'ed jni lib
versions.

Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I1b9f4fde345038bda6b3ffcf8e3f47cf9262e052
This commit is contained in:
Patrick Rohr 2022-01-28 15:39:17 +01:00
commit 361b859b00

View file

@ -57,23 +57,29 @@ cc_library_shared {
"-Wthread-safety",
],
srcs: [
"jni/com_android_server_TestNetworkService.cpp",
"jni/com_android_server_BpfNetMaps.cpp",
"jni/com_android_server_connectivity_ClatCoordinator.cpp",
"jni/com_android_server_TestNetworkService.cpp",
"jni/onload.cpp",
],
stl: "libc++_static",
header_libs: [
"bpf_connectivity_headers",
"libbase_headers",
],
static_libs: [
"libbase",
"libclat",
"libip_checksum",
"libnetdutils",
"libnetjniutils",
"libtraffic_controller",
"netd_aidl_interface-lateststable-ndk",
],
shared_libs: [
"liblog",
"libnativehelper",
"libutils",
],
apex_available: [
"com.android.tethering",