| commit | cfea3d9b59d24e41973cbcfb13738f2b27f6b10e | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Dec 14 19:29:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 19:29:18 2016 +0000 |
| tree | 542a2613b8beb3a0bd4d1ad03b0b7b1857df99e4 | |
| parent | 226144468b6ad76fab50b5aa6a877de7e5501df0 [diff] | |
| parent | ec43ed7d462ac4b32fcb1bf61682cebccfb8c34e [diff] |
Merge "Remove obsolete __BRILLO__ ifdef." am: a95e9aff7c am: ec43ed7d46 Change-Id: I5d805ca634f8d11799d4333a0de53dcad821bb76
diff --git a/init/init.cpp b/init/init.cpp index 75b36cf..2d474c7 100644 --- a/init/init.cpp +++ b/init/init.cpp
@@ -352,10 +352,6 @@ 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();