commit 995f534bf38a9b96bf33ce31520fb07f4f2b2c74
author Dmitry Shmidt <dimitrysh@google.com> Thu Aug 24 01:35:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 24 01:35:14 2017 +0000
tree b8e6f2b6aed490563adfd78caa2dd70bdd68cfba
parent 27139e7d656f399476e12c328261aecbb8606041
parent d489653098cdb6d3f3c73be228c7a698198cb7e0

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

Change-Id: I67de65e24f4573166aa2e48160b33b3506e28ad1

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 \