Merge "Remove obsolete __BRILLO__ ifdef."

am: a95e9aff7c Change-Id: I5099d1c3949b6fd25d7bdaa0f671ec7eaf3d79a1
2016-12-14 19:23:18 +00:00 · 2016-12-14 19:23:18 +00:00 · ec43ed7d46
parent 94eac36e98 a95e9aff7c
commit ec43ed7d46
1 changed files with 0 additions and 4 deletions
--- a/init/init.cpp
+++ b/init/init.cpp
@ -352,10 +352,6 @@ static int set_mmap_rnd_bits_action(const std::vector<std::string>& args)
    LOG(ERROR) << "Unknown architecture";
 #endif

-#ifdef __BRILLO__
-    // TODO: b/27794137
-    ret = 0;
-#endif
    if (ret == -1) {
        LOG(ERROR) << "Unable to set adequate mmap entropy value!";
        security_failure();