commit 551b494601934641d37bf852f3fda0d584fd2374
author Dmitry Shmidt <dimitrysh@google.com> Wed Aug 23 14:57:07 2017 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Wed Aug 23 14:57:07 2017 -0700
tree 3d7a6fa93ef244495278522d6c2d77a134ae12b4
parent 2bb5d776e23d62093f0be2d1627c1a0f1ac43068

init: Fix -DUSER_MODE_LINUX compilation

Bug: 64985489
Test: Manual

Change-Id: Ib37d2b9affe500b66b9243fb24a7dee23b7730f2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

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 \