commit 08bf0563706ae8173fb91a43d7da754baf50a2b5
author Patrick Rohr <prohr@google.com> Thu Jan 16 11:41:59 2025 -0800
committer Patrick Rohr <prohr@google.com> Thu Jan 16 14:28:13 2025 -0800
tree a9581ef4acb044b30ce13077153923f18e0dee26
parent 3c140784356c4e415c9f1e3a0dc808aabecbd087

Rename net_utils_device_common_timerfdjni to serviceconnectivityjni

Test: builds and boots
Change-Id: I432da644ab6d212df736913089ff3b52d286ea0e

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 43027e1..c4e2ef0 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -124,7 +124,7 @@
         "libmodules-utils-build",
         "libnetjniutils",
         "libnet_utils_device_common_bpfjni",
-        "libnet_utils_device_common_timerfdjni",
+        "libserviceconnectivityjni",
         "netd_aidl_interface-lateststable-ndk",
     ],
     shared_libs: [

staticlibs/native/serviceconnectivityjni/Android.bp

diff --git a/staticlibs/native/timerfdutils/Android.bp b/staticlibs/native/serviceconnectivityjni/Android.bp
similarity index 96%
rename from staticlibs/native/timerfdutils/Android.bp
rename to staticlibs/native/serviceconnectivityjni/Android.bp
index b9298ae..18246dd 100644
--- a/staticlibs/native/timerfdutils/Android.bp
+++ b/staticlibs/native/serviceconnectivityjni/Android.bp
@@ -18,7 +18,7 @@
 }
 
 cc_library_static {
-    name: "libnet_utils_device_common_timerfdjni",
+    name: "libserviceconnectivityjni",
     srcs: [
         "com_android_net_module_util_ServiceConnectivityJni.cpp",
     ],

staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp

diff --git a/staticlibs/native/timerfdutils/com_android_net_module_util_ServiceConnectivityJni.cpp b/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp
similarity index 100%
rename from staticlibs/native/timerfdutils/com_android_net_module_util_ServiceConnectivityJni.cpp
rename to staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp

staticlibs/tests/unit/jni/Android.bp

diff --git a/staticlibs/tests/unit/jni/Android.bp b/staticlibs/tests/unit/jni/Android.bp
index e456471..c444159 100644
--- a/staticlibs/tests/unit/jni/Android.bp
+++ b/staticlibs/tests/unit/jni/Android.bp
@@ -30,7 +30,7 @@
         "com_android_net_moduletests_util/onload.cpp",
     ],
     static_libs: [
-        "libnet_utils_device_common_timerfdjni",
+        "libserviceconnectivityjni",
     ],
     shared_libs: [
         "liblog",

tests/unit/jni/Android.bp

diff --git a/tests/unit/jni/Android.bp b/tests/unit/jni/Android.bp
index 50971e7..1a833e1 100644
--- a/tests/unit/jni/Android.bp
+++ b/tests/unit/jni/Android.bp
@@ -42,7 +42,7 @@
     ],
     static_libs: [
         "libnet_utils_device_common_bpfjni",
-        "libnet_utils_device_common_timerfdjni",
+        "libserviceconnectivityjni",
         "libtcutils",
     ],
     shared_libs: [