From c3bc5090967e3e28af2b52d4150923ffd289a15c Mon Sep 17 00:00:00 2001
From: Dmitry Shmidt <dimitrysh@google.com>
Date: Wed, 23 Aug 2017 14:57:07 -0700
Subject: [PATCH] init: Fix -DUSER_MODE_LINUX compilation

Bug: 64985489
Test: Manual

Change-Id: Ib37d2b9affe500b66b9243fb24a7dee23b7730f2
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
 init/Android.bp | 3 +++
 init/Android.mk | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/init/Android.bp b/init/Android.bp
index b1f02793f..efa5a022c 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -54,6 +54,9 @@ cc_defaults {
                 "-DSHUTDOWN_ZERO_TIMEOUT=1",
             ],
         },
+        uml: {
+            cppflags: ["-DUSER_MODE_LINUX"],
+        }
     },
 }
 
diff --git a/init/Android.mk b/init/Android.mk
index 3886ed52f..23ada73a5 100644
--- 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 \