commit a7b89c3e7db25cd847d5e6ede692f1611225475a
author Quang Luong <qal@google.com> Tue Jul 18 22:39:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 18 22:39:00 2017 +0000
tree 4552d712251708ddcf6b81ec03d21de4043a8df8
parent 2d3458590ea953cf4732e5e921d08cb98bb75976
parent 315c70d81fb4e850426cfc3afb8b857670d11cf8

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

Change-Id: I223ebf56a8bbefb38735ebbcfe45c7d2a78cd50c

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 e24b9c1..e84d069 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)) {