Merge "Replace android::sp by std::shared_ptr and drop the libutils dependency" into main am: 6ad81f522b am: 86a41c35bb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2875498

Change-Id: I9ca4602826eadd625ebc30766db965cddf03781f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 4 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 4047527d..f0fd5c63 100644
--- a/Android.bp
+++ b/Android.bp
@@ -275,7 +275,6 @@ cc_library {
         "libprotobuf-cpp-lite",
         "libstatslog_resolv",
         "libsysutils",
-        "libutils",
         "netd_event_listener_interface-lateststable-ndk",
         "server_configurable_flags",
         "stats_proto",
diff --git a/Dns64Configuration.cpp b/Dns64Configuration.cpp
index fc1428db..c09ce368 100644
--- a/Dns64Configuration.cpp
+++ b/Dns64Configuration.cpp
@@ -24,7 +24,6 @@
 #include <netdutils/DumpWriter.h>
 #include <netdutils/InternetAddresses.h>
 #include <netdutils/ThreadUtil.h>
-#include <utils/StrongPointer.h>
 #include <thread>
 #include <utility>
 
@@ -37,7 +36,6 @@
 
 namespace android {
 
-using android::sp;
 using netdutils::DumpWriter;
 using netdutils::IPAddress;
 using netdutils::IPPrefix;
@@ -63,7 +61,7 @@ void Dns64Configuration::startPrefixDiscovery(unsigned netId) {
     // Emplace a copy of |cfg| in the map.
     mDns64Configs.emplace(std::make_pair(netId, cfg));
 
-    const sp<Dns64Configuration> thiz = sp<Dns64Configuration>::fromExisting(this);
+    const std::shared_ptr<Dns64Configuration> thiz = shared_from_this();
     // Note that capturing |cfg| in this lambda creates a copy.
     std::thread discovery_thread([thiz, cfg, netId] {
         setThreadName(fmt::format("Nat64Pfx_{}", netId));
diff --git a/Dns64Configuration.h b/Dns64Configuration.h
index 4170e32d..35d3afed 100644
--- a/Dns64Configuration.h
+++ b/Dns64Configuration.h
@@ -27,7 +27,6 @@
 #include <android-base/thread_annotations.h>
 #include <netdutils/DumpWriter.h>
 #include <netdutils/InternetAddresses.h>
-#include <utils/RefBase.h>
 
 struct android_net_context;
 
@@ -49,7 +48,7 @@ namespace net {
  * Thread-safety: All public methods in this class MUST be thread-safe.
  * (In other words: this class handles all its locking privately.)
  */
-class Dns64Configuration : virtual public RefBase {
+class Dns64Configuration : public std::enable_shared_from_this<Dns64Configuration> {
   public:
     // Simple data struct for passing back packet NAT64 prefix event information to the
     // Dns64PrefixCallback callback.
diff --git a/ResolverController.cpp b/ResolverController.cpp
index 757e3f74..3198ec25 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -155,7 +155,7 @@ int getDnsInfo(unsigned netId, std::vector<std::string>* servers, std::vector<st
 }  // namespace
 
 ResolverController::ResolverController()
-    : mDns64Configuration(android::sp<Dns64Configuration>::make(
+    : mDns64Configuration(make_shared<Dns64Configuration>(
               [](uint32_t netId, uint32_t uid, android_net_context* netcontext) {
                   gResNetdCallbacks.get_network_context(netId, uid, netcontext);
               },
diff --git a/ResolverController.h b/ResolverController.h
index b74cff92..c2fc8e77 100644
--- a/ResolverController.h
+++ b/ResolverController.h
@@ -66,7 +66,7 @@ class ResolverController {
     void dump(netdutils::DumpWriter& dw, unsigned netId);
 
   private:
-    android::sp<Dns64Configuration> mDns64Configuration;
+    std::shared_ptr<Dns64Configuration> mDns64Configuration;
 };
 }  // namespace net
 }  // namespace android
diff --git a/tests/Android.bp b/tests/Android.bp
index b1266037..d18deaab 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -274,7 +274,6 @@ cc_test {
         "libstatslog_resolv",
         "libstatspush_compat",
         "libsysutils",
-        "libutils",
         "resolv_stats_test_utils",
         "server_configurable_flags",
         "stats_proto",