Merge "init: Fix -DUSER_MODE_LINUX compilation" am: 9a38df3f5f am: d1821522aa

am: 14a60d2e19 Change-Id: I67de65e24f4573166aa2e48160b33b3506e28ad1
2017-08-24 01:35:14 +00:00 · 2017-08-24 01:35:14 +00:00 · e9b1299f74
parent 22d9a9a249 14a60d2e19
commit e9b1299f74
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 \