commit 9cf9040fec13d9e4cf99dd059b1e67fe3858745d
author Quang Luong <qal@google.com> Tue Jul 18 23:24:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 18 23:24:51 2017 +0000
tree 3eecb9558d61b9765c906b0c27a82ede8357ae26
parent c730ae7ed9b072fafb074a3469219a7610cacbf8
parent a7b89c3e7db25cd847d5e6ede692f1611225475a

Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea424d am: c1e78e1331 am: be2a262b47
am: 6bcf4fb8b5

Change-Id: I1b6656bc4ec0dbebccb4fe92c6f73f9be6965353

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index dc3360d..c0c4905 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -28,6 +28,10 @@
 
 init_options += -DLOG_UEVENTS=0
 
+ifeq ($(TARGET_USER_MODE_LINUX), true)
+    init_cflags += -DUSER_MODE_LINUX
+endif
+
 init_cflags += \
     $(init_options) \
     -Wall -Wextra \

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 377c7d1..55d5fa8 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -391,7 +391,10 @@
     int ret = -1;
 
     /* values are arch-dependent */
-#if defined(__aarch64__)
+#if defined(USER_MODE_LINUX)
+    /* uml does not support mmap_rnd_bits */
+    ret = 0;
+#elif defined(__aarch64__)
     /* arm64 supports 18 - 33 bits depending on pagesize and VA_SIZE */
     if (set_mmap_rnd_bits_min(33, 24, false)
             && set_mmap_rnd_bits_min(16, 16, true)) {