commit a7870d88167f619e758b5bcd15b410d16da7c16b
author Nicolas Geoffray <ngeoffray@google.com> Mon Mar 16 10:29:36 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Mar 16 11:07:29 2015 +0000
tree 8db9bc4aa940a8b3a44cf31dacd3a7f932eadc80
parent acf0a8b3f632fe90132b9ce457a2237160f8cb9a

Revert "Create libbase."

Breaks internal master.

This reverts commit 98ff77204cef9bb8f0f27420833233622060a09e.

Change-Id: I18dc6021cb43efff8aa88486c2d980dc2b8eedba

init/util.cpp

diff --git a/init/util.cpp b/init/util.cpp
index c805083..3dddb15 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -32,11 +32,11 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <base/file.h>
-
 /* for ANDROID_SOCKET_* */
 #include <cutils/sockets.h>
 
+#include <utils/file.h>
+
 #include <private/android_filesystem_config.h>
 
 #include "init.h"
@@ -168,7 +168,7 @@
         return false;
     }
 
-    bool okay = android::base::ReadFdToString(fd, content);
+    bool okay = android::ReadFdToString(fd, content);
     TEMP_FAILURE_RETRY(close(fd));
     if (okay) {
         content->append("\n", 1);
@@ -181,7 +181,7 @@
     if (fd == -1) {
         return -errno;
     }
-    int result = android::base::WriteStringToFd(content, fd) ? 0 : -errno;
+    int result = android::WriteStringToFd(content, fd) ? 0 : -errno;
     TEMP_FAILURE_RETRY(close(fd));
     return result;
 }