commit 3b469f8bf0ee4d505ae15a879b42e9d908c50430
author Elliott Hughes <enh@google.com> Thu Jun 11 17:08:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 11 17:08:56 2015 +0000
tree 4faf0b42bde34797e23faab77e34543bb053a839
parent 92aa7b582c2b550adf8da53a858c1d1b67ff94a1
parent 1996447d48be6482d3ee82ecdbbe2a7705bc7d93

am 9371cf0e: am 67917cf5: am 57bd480c: Merge "Make it clearer to grep that init is built with clang."

* commit '9371cf0e312b539e836c1233a904dc2a7123fedf':
  Make it clearer to grep that init is built with clang.

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index f154cc3..6ef8dff 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -18,8 +18,6 @@
     -Wno-unused-parameter \
     -Werror \
 
-init_clang := true
-
 # --
 
 include $(CLEAR_VARS)
@@ -32,7 +30,7 @@
 
 LOCAL_STATIC_LIBRARIES := libbase
 LOCAL_MODULE := libinit
-LOCAL_CLANG := $(init_clang)
+LOCAL_CLANG := true
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -81,7 +79,7 @@
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 
-LOCAL_CLANG := $(init_clang)
+LOCAL_CLANG := true
 include $(BUILD_EXECUTABLE)
 
 
@@ -98,5 +96,5 @@
     libbase \
 
 LOCAL_STATIC_LIBRARIES := libinit
-LOCAL_CLANG := $(init_clang)
+LOCAL_CLANG := true
 include $(BUILD_NATIVE_TEST)