Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d0f40f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ic190bd8c,I865044c8 

* changes:
  Convert missed ERROR() to LOG(ERROR).
  Fix include order.
parents f03e6c80 41d0b6d3

init/init.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <dirent.h>

#include <dirent.h>

#include <errno.h>

#include <errno.h>

#include <fcntl.h>

#include <fcntl.h>

#include <fstream>

#include <inttypes.h>

#include <inttypes.h>

#include <libgen.h>

#include <libgen.h>

#include <paths.h>

#include <paths.h>
@@ -50,6 +49,7 @@ 
#include <cutils/sockets.h>

#include <cutils/sockets.h>

#include <private/android_filesystem_config.h>

#include <private/android_filesystem_config.h>





#include <fstream>

#include <memory>

#include <memory>





#include "action.h"

#include "action.h"
@@ -349,7 +349,7 @@ static int set_mmap_rnd_bits_action(const std::vector<std::string>& args) 
    // TODO: add mips support b/27788820

    // TODO: add mips support b/27788820

    ret = 0;

    ret = 0;

#else

#else

    ERROR("Unknown architecture\n");

    LOG(ERROR) << "Unknown architecture";

#endif

#endif





#ifdef __BRILLO__

#ifdef __BRILLO__