commit 7bbe7a9d36bbf41ee330ffbc58418fbd3978436d
author Elliott Hughes <enh@google.com> Tue Mar 31 01:00:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 31 01:00:53 2015 +0000
tree 9f6e00b6347447c6517d469cd5e470a71cd2a3da
parent de4a1ee40ba6630c01e27598cc3c9246ae410d85
parent 001ec99caa512fcd950981733b52a819c344c7ec

am 4bd43889: am 656957e8: am a58c0b5f: Merge "Build init with clang."

* commit '4bd43889c9aedfaff093ca81bca7c7b81b3061f0':
  Build init with clang.

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index cb4cb11..94d3dad 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -18,6 +18,8 @@
     -Wno-unused-parameter \
     -Werror \
 
+init_clang := true
+
 # --
 
 include $(CLEAR_VARS)
@@ -30,6 +32,7 @@
 
 LOCAL_STATIC_LIBRARIES := libbase
 LOCAL_MODULE := libinit
+LOCAL_CLANG := $(init_clang)
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -69,6 +72,7 @@
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 
+LOCAL_CLANG := $(init_clang)
 include $(BUILD_EXECUTABLE)
 
 
@@ -85,4 +89,5 @@
     libbase \
 
 LOCAL_STATIC_LIBRARIES := libinit
+LOCAL_CLANG := $(init_clang)
 include $(BUILD_NATIVE_TEST)