| commit | 42ac407b5187b93bd18dae1411b67e5b66e91e59 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Dec 14 19:23:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 19:23:18 2016 +0000 |
| tree | 333104280c99e48a6f7f014fd69a6bf6630792a0 | |
| parent | a878d607849b75bf71ac1e7600fbbc3fb9a650c3 [diff] | |
| parent | 9b682d8149e411aadd4a944e9b2eebf5451b2291 [diff] |
Merge "Remove obsolete __BRILLO__ ifdef." am: a95e9aff7c Change-Id: I5099d1c3949b6fd25d7bdaa0f671ec7eaf3d79a1
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();