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

* commit '67917cf590ae497ce7700dc7a6b618b3a6700a39':
  Make it clearer to grep that init is built with clang.
This commit is contained in:
Elliott Hughes 2015-06-11 15:25:20 +00:00 committed by Android Git Automerger
commit 9371cf0e31
1 changed files with 3 additions and 5 deletions

View File

@ -18,8 +18,6 @@ init_cflags += \
-Wno-unused-parameter \
-Werror \
init_clang := true
# --
include $(CLEAR_VARS)
@ -32,7 +30,7 @@ LOCAL_SRC_FILES:= \
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 @@ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
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 @@ LOCAL_SHARED_LIBRARIES += \
libbase \
LOCAL_STATIC_LIBRARIES := libinit
LOCAL_CLANG := $(init_clang)
LOCAL_CLANG := true
include $(BUILD_NATIVE_TEST)