commit eaad25df5a328f458e68e3d43c93d29c1c1b5f52
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 14 17:36:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 14 17:36:25 2016 +0000
tree d7197b775a4ac4e57696222bf0e18d4b45555130
parent 83016715b9402e5200f076864113f5e7c747b591
parent 1199e4207ffd22f3befaa365986b6fef9cf4f089

Merge changes Ic190bd8c,I865044c8

* changes:
  Convert missed ERROR() to LOG(ERROR).
  Fix include order.

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 3165406..75b36cf 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
 
 #ifdef __BRILLO__