| commit | 4390837bf907ac3a9bbf95570ca75bf448d8087b | [log] [tgz] |
|---|---|---|
| author | Daniel Cashman <dcashman@google.com> | Tue Mar 22 22:38:33 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 22 22:38:33 2016 +0000 |
| tree | f64d38baa80da1c791a924888f9e24071081aeb4 | |
| parent | 593a5c1573c8e5f0cc0d5312c3f1cc5ba8e17169 [diff] | |
| parent | 3396b4b665ab9a4db83b31ee001e3a32906698e9 [diff] |
Merge "Temporarily add set_mmap_rnd_bits brillo exception"
diff --git a/init/init.cpp b/init/init.cpp index b1e3a9d..fb660eb 100644 --- a/init/init.cpp +++ b/init/init.cpp
@@ -372,6 +372,11 @@ #else ERROR("Unknown architecture\n"); #endif + +#ifdef __BRILLO__ + // TODO: b/27794137 + ret = 0; +#endif if (ret == -1) { ERROR("Unable to set adequate mmap entropy value!\n"); security_failure();