diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-24 01:14:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-24 01:14:36 +0000 |
| commit | 9a38df3f5f03d1ed20bf9a196a53ec00eb5970e0 (patch) | |
| tree | 783c131bf976c72a377882dc8ac239965871fe43 /init | |
| parent | d865b655d52bc7e637d4fe49bb4048f016ea44ef (diff) | |
| parent | c3bc5090967e3e28af2b52d4150923ffd289a15c (diff) | |
| download | core-9a38df3f5f03d1ed20bf9a196a53ec00eb5970e0.tar.gz core-9a38df3f5f03d1ed20bf9a196a53ec00eb5970e0.tar.bz2 core-9a38df3f5f03d1ed20bf9a196a53ec00eb5970e0.zip | |
Merge "init: Fix -DUSER_MODE_LINUX compilation"
Diffstat (limited to 'init')
| -rw-r--r-- | init/Android.bp | 3 | ||||
| -rw-r--r-- | 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 \ |