commit 6b69d12c96908371c14378cce265caf43cfb35b3
author Elliott Hughes <enh@google.com> Thu Jun 11 15:11:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 11 15:11:33 2015 +0000
tree fae3cb75e4c30461b086ad5711a5eb6337906781
parent 667a3578043668c38898dcbe58a3940a594edf35
parent 58eeefab9ad3cba0680dec5d3809ff4610b3edb5

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

* commit '57bd480c3b7c506423c6016e977539213d4c0759':
  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 b14f9b5..45b002d 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)
@@ -79,7 +77,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)
 
 
@@ -96,5 +94,5 @@
     libbase \
 
 LOCAL_STATIC_LIBRARIES := libinit
-LOCAL_CLANG := $(init_clang)
+LOCAL_CLANG := true
 include $(BUILD_NATIVE_TEST)