| commit | 0f4793a401abb8fe03ba0a95e87d67a6e6e62791 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Dec 14 19:35:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 19:35:24 2016 +0000 |
| tree | 542a2613b8beb3a0bd4d1ad03b0b7b1857df99e4 | |
| parent | 5ac2d1b99a3b9eac33b21f2cce4f939838e182fd [diff] | |
| parent | cfea3d9b59d24e41973cbcfb13738f2b27f6b10e [diff] |
Merge "Remove obsolete __BRILLO__ ifdef." am: a95e9aff7c am: ec43ed7d46 am: cfea3d9b59 Change-Id: I27a191f4f03b47c05f8c0809e7bbc8966cbaa5fa
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();