commit 4a2adca19ca73157024c23144f643e2060378195
author Mark Salyzyn <salyzyn@google.com> Tue Mar 22 23:18:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 22 23:18:59 2016 +0000
tree 91c0b1893df4c765add99c14d23dcecc3c2fb34d
parent 3614bc6f0bb903f903c2b200cd47d8d884a2766b
parent 728bdc55a94f2215c0cd3312aa7f33ebb1350015

Merge changes If37ef423,If93df3ae,I01b38637 into nyc-dev

* changes:
  liblog: add __android_log_pmsg_file_read
  liblog: add __android_log_pmsg_file_write
  liblog: split out transports into separate files

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index b24d839..0ff55a5 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -354,7 +354,7 @@
             && set_mmap_rnd_bits_min(16, 16, true)) {
         ret = 0;
     }
-#elif defined(__x86__64__)
+#elif defined(__x86_64__)
     /* x86_64 supports 28 - 32 bits */
     if (set_mmap_rnd_bits_min(32, 32, false)
             && set_mmap_rnd_bits_min(16, 16, true)) {
@@ -373,6 +373,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();