From 08bf0563706ae8173fb91a43d7da754baf50a2b5 Mon Sep 17 00:00:00 2001
From: Patrick Rohr <prohr@google.com>
Date: Thu, 16 Jan 2025 11:41:59 -0800
Subject: [PATCH] Rename net_utils_device_common_timerfdjni to
 serviceconnectivityjni

Test: builds and boots
Change-Id: I432da644ab6d212df736913089ff3b52d286ea0e
---
 service/Android.bp                                              | 2 +-
 .../native/{timerfdutils => serviceconnectivityjni}/Android.bp  | 2 +-
 .../com_android_net_module_util_ServiceConnectivityJni.cpp      | 0
 staticlibs/tests/unit/jni/Android.bp                            | 2 +-
 tests/unit/jni/Android.bp                                       | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename staticlibs/native/{timerfdutils => serviceconnectivityjni}/Android.bp (96%)
 rename staticlibs/native/{timerfdutils => serviceconnectivityjni}/com_android_net_module_util_ServiceConnectivityJni.cpp (100%)

diff --git a/service/Android.bp b/service/Android.bp
index 43027e161a..c4e2ef0b23 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -124,7 +124,7 @@ cc_library_shared {
         "libmodules-utils-build",
         "libnetjniutils",
         "libnet_utils_device_common_bpfjni",
-        "libnet_utils_device_common_timerfdjni",
+        "libserviceconnectivityjni",
         "netd_aidl_interface-lateststable-ndk",
     ],
     shared_libs: [
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 b9298ae35c..18246ddf9d 100644
--- a/staticlibs/native/timerfdutils/Android.bp
+++ b/staticlibs/native/serviceconnectivityjni/Android.bp
@@ -18,7 +18,7 @@ package {
 }
 
 cc_library_static {
-    name: "libnet_utils_device_common_timerfdjni",
+    name: "libserviceconnectivityjni",
     srcs: [
         "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
diff --git a/staticlibs/tests/unit/jni/Android.bp b/staticlibs/tests/unit/jni/Android.bp
index e456471be2..c44415920c 100644
--- a/staticlibs/tests/unit/jni/Android.bp
+++ b/staticlibs/tests/unit/jni/Android.bp
@@ -30,7 +30,7 @@ cc_library_shared {
         "com_android_net_moduletests_util/onload.cpp",
     ],
     static_libs: [
-        "libnet_utils_device_common_timerfdjni",
+        "libserviceconnectivityjni",
     ],
     shared_libs: [
         "liblog",
diff --git a/tests/unit/jni/Android.bp b/tests/unit/jni/Android.bp
index 50971e7359..1a833e1772 100644
--- a/tests/unit/jni/Android.bp
+++ b/tests/unit/jni/Android.bp
@@ -42,7 +42,7 @@ cc_library_shared {
     ],
     static_libs: [
         "libnet_utils_device_common_bpfjni",
-        "libnet_utils_device_common_timerfdjni",
+        "libserviceconnectivityjni",
         "libtcutils",
     ],
     shared_libs: [