| commit | 5ef5c5eba247ece92bd22b7e70746e55bed79253 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Dec 14 19:47:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 19:47:19 2016 +0000 |
| tree | 316a9d12305349505b8e1ebcac629579f446812c | |
| parent | 1dc9722d73eea683dc992cdb700370f5e7a83fca [diff] | |
| parent | af174cb5f57fa19399e0090e84c349ddf8e9f4a7 [diff] |
Merge "Remove obsolete __BRILLO__ ifdef." am: a95e9aff7c am: ec43ed7d46 am: cfea3d9b59 am: 0f4793a401 Change-Id: I269a07da7aaf362949a083bf6ac32e1e44ed9f94
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();