commit 2d4a2383d6380699a14dfb833f754734895d1903
author Dmitry Shmidt <dimitrysh@google.com> Thu Aug 24 01:23:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 24 01:23:01 2017 +0000
tree 6412b66a0d8a2e13ae16430b4c7686b436c8c04c
parent 8f8354bbfb560ad8ef55b002d23e1a7547f756ff
parent 4c9773a5170f69fdfc9cf7f1eb00937244061023

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

Change-Id: I26d86100bb8f76325b46ba2c2d066e856d910396

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index b1f0279..efa5a02 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -54,6 +54,9 @@
                 "-DSHUTDOWN_ZERO_TIMEOUT=1",
             ],
         },
+        uml: {
+            cppflags: ["-DUSER_MODE_LINUX"],
+        }
     },
 }
 

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 3886ed5..23ada73 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -30,10 +30,6 @@
 
 init_options += -DLOG_UEVENTS=0
 
-ifeq ($(TARGET_USER_MODE_LINUX), true)
-    init_cflags += -DUSER_MODE_LINUX
-endif
-
 init_cflags += \
     $(init_options) \
     -Wall -Wextra \