Merge "init: Fix -DUSER_MODE_LINUX compilation"

am: 9a38df3f5f Change-Id: I26d86100bb8f76325b46ba2c2d066e856d910396
2017-08-24 01:23:01 +00:00 · 2017-08-24 01:23:01 +00:00 · d1821522aa
commit d1821522aa
parent 37f256423b 9a38df3f5f
2 changed files with 3 additions and 4 deletions
--- a/init/Android.bp
+++ b/init/Android.bp
@ -54,6 +54,9 @@ cc_defaults {
                "-DSHUTDOWN_ZERO_TIMEOUT=1",
            ],
        },
+        uml: {
+            cppflags: ["-DUSER_MODE_LINUX"],
+        }
    },
 }

--- a/init/Android.mk
+++ b/init/Android.mk
@ -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 \