summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-10-16 16:27:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-16 16:27:07 +0000
commit2d241ec8a86c56bbf8522eb007674d7b4e3d164d (patch)
treeb8146e993726b41cc115ea70f0b65e273a64efe3
parent07f1300c4c4f7d3c0df540bf8df3443c3f4539cd (diff)
parent3a3871769130428bc1b8f3de03be7231750e1b82 (diff)
downloadsystem_core-2d241ec8a86c56bbf8522eb007674d7b4e3d164d.zip
system_core-2d241ec8a86c56bbf8522eb007674d7b4e3d164d.tar.gz
system_core-2d241ec8a86c56bbf8522eb007674d7b4e3d164d.tar.bz2
am 3a387176: Merge "Don\'t build init with clang for now"
* commit '3a3871769130428bc1b8f3de03be7231750e1b82': Don't build init with clang for now
-rw-r--r--init/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/init/Android.mk b/init/Android.mk
index 489dc93..72c2272 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -33,6 +33,10 @@ endif
LOCAL_MODULE:= init
+# Currently, init doesn't start when built with clang.
+# Needs further investigation.
+LOCAL_CLANG := false
+
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED)