commit 9b682d8149e411aadd4a944e9b2eebf5451b2291
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 14 19:14:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 14 19:14:08 2016 +0000
tree 333104280c99e48a6f7f014fd69a6bf6630792a0
parent eaad25df5a328f458e68e3d43c93d29c1c1b5f52
parent 0bc1e4665df1d702b40819178640767a2bffed4a

Merge "Remove obsolete __BRILLO__ ifdef."

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 7e5ee43..2d474c7 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -18,7 +18,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fstream>
 #include <inttypes.h>
 #include <libgen.h>
 #include <paths.h>
@@ -50,6 +49,7 @@
 #include <cutils/sockets.h>
 #include <private/android_filesystem_config.h>
 
+#include <fstream>
 #include <memory>
 
 #include "action.h"
@@ -349,7 +349,7 @@
     // TODO: add mips support b/27788820
     ret = 0;
 #else
-    ERROR("Unknown architecture\n");
+    LOG(ERROR) << "Unknown architecture";
 #endif
 
     if (ret == -1) {