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

Commit 14a60d2e authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by android-build-merger
Browse files

Merge "init: Fix -DUSER_MODE_LINUX compilation" am: 9a38df3f 

am: d1821522

Change-Id: Ic34bcb0be554736edd6c293820ab1fc9ff79bf34
parents 7096d478 d1821522

init/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ cc_defaults { 
                "-DSHUTDOWN_ZERO_TIMEOUT=1",

            ],

        },

        uml: {

            cppflags: ["-DUSER_MODE_LINUX"],

        }

    },

}

init/Android.mk

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


init_options += -DLOG_UEVENTS=0



ifeq ($(TARGET_USER_MODE_LINUX), true)

    init_cflags += -DUSER_MODE_LINUX

endif



init_cflags += \

    $(init_options) \

    -Wall -Wextra \