commit b257d61cd55c00a50d1eaaf4e7fcf436185c9a2c
author Luke Huang <huangluke@google.com> Thu Mar 14 21:19:13 2019 +0800
committer Luke Huang <huangluke@google.com> Fri Mar 15 05:39:32 2019 +0000
tree 64d7506a60930613bd01650636c7525b09435b5f
parent 2142a2b0554c9e06e2be272020d02819e046c0b3

Move DumpWriter to libnetdutils

resolver related component in libnetd_resolv
needs it to easily print dump log.

Bug: 122564854
Test: built, flashed, booted
      system/netd/tests/runtests.sh pass
      adb shell dumpsys netd, worked fine

Change-Id: Ic97d5f21b738fc3074e9308f4846191e744ed479

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index dcf8e02..7728e0e 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -37,7 +37,6 @@
 #include <openssl/base64.h>
 
 #include "Controllers.h"
-#include "DumpWriter.h"
 #include "InterfaceController.h"
 #include "NetdConstants.h"  // SHA256_SIZE
 #include "NetdNativeService.h"
@@ -48,12 +47,15 @@
 #include "SockDiag.h"
 #include "UidRanges.h"
 #include "android/net/BnNetd.h"
+#include "netdutils/DumpWriter.h"
 #include "netid_client.h"  // NETID_UNSET
 
 using android::base::StringPrintf;
 using android::base::WriteStringToFile;
 using android::net::TetherStatsParcel;
 using android::net::UidRangeParcel;
+using android::netdutils::DumpWriter;
+using android::netdutils::ScopedIndent;
 using android::os::ParcelFileDescriptor;
 
 namespace android {