Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bcf4fb8 authored by Quang Luong's avatar Quang Luong Committed by android-build-merger
Browse files

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

Merge "uml: init: add USER_MODE_LINUX cflag, USER_MODE_LINUX case in init.cpp" am: a022ea42 am: c1e78e13
am: be2a262b

Change-Id: I223ebf56a8bbefb38735ebbcfe45c7d2a78cd50c
parents 61aaf752 be2a262b

init/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ endif 


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

+4 −1
Original line number Diff line number Diff line
@@ -391,7 +391,10 @@ static int set_mmap_rnd_bits_action(const std::vector<std::string>& args) 
    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)) {