commit 5407e14fd3d81bb76f94221b4a359faa2806de65
author Dan Albert <danalbert@google.com> Mon Mar 16 10:05:59 2015 -0700
committer Dan Albert <danalbert@google.com> Mon Mar 16 13:50:59 2015 -0700
tree 6ca19120267ce67ed67265dab49feac7e81825bc
parent afd4037d7d7802d2ecc0494901ac17134a27aa1f

Revert "Revert "Update for libbase.""

This reverts commit 4a0ab5ff4a87cfc4a987da99546b01e44875a2e5.

(cherry picked from commit 3e87c785434fdfed2fb00496cb391c411a426bdd)

Change-Id: I042f485f3cc84206766298853491ddd26dbba13f

server/RouteController.cpp

diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index 98a965e..889779d 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -31,13 +31,15 @@
 #include "UidRanges.h"
 #include "DummyNetwork.h"
 
+#include "base/file.h"
 #define LOG_TAG "Netd"
 #include "log/log.h"
 #include "logwrap/logwrap.h"
 #include "netutils/ifc.h"
-#include "utils/file.h"
 #include "resolv_netid.h"
 
+using android::base::WriteStringToFile;
+
 namespace {
 
 // BEGIN CONSTANTS --------------------------------------------------------------------------------
@@ -168,7 +170,7 @@
         addTableName(entry.second, entry.first, &contents);
     }
 
-    if (!android::WriteStringToFile(contents, RT_TABLES_PATH, RT_TABLES_MODE, AID_SYSTEM, AID_WIFI)) {
+    if (!WriteStringToFile(contents, RT_TABLES_PATH, RT_TABLES_MODE, AID_SYSTEM, AID_WIFI)) {
         ALOGE("failed to write to %s (%s)", RT_TABLES_PATH, strerror(errno));
         return;
     }