commit c69a9014788a2ab5616de46fb31c3815fe631794
author Quang Luong <qal@google.com> Tue Jul 18 21:20:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 18 21:20:26 2017 +0000
tree 604eb7b043d0e3fc224dfdf99ee7a6bc455e40dc
parent ceeb6ed24232a468fcb34cc9b0d2cb5f0ea3d42e
parent 50fd20b161d8464826562819f828ef3a2b8defe8

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

Change-Id: Ie4b2131525373fef14dfa2c7a7ec1e23a50dc56a

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 6cd47f4..325614e 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -30,6 +30,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 1cfa70a..0dfaf9e 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)) {