Merge "Make it an error when LOCAL_CLANG is false." am: 9204b776bb

am: f329021c0f

Change-Id: Ie0ea0c0ce8125724cf5c0b4fcf8ec2147d7777e9
This commit is contained in:
Chih-hung Hsieh 2016-08-05 22:38:18 +00:00 committed by android-build-merger
commit aefdd322de
2 changed files with 2 additions and 1 deletions

View file

@ -278,7 +278,7 @@ endif
# in the exception project list.
ifeq ($(my_clang),false)
ifeq ($(call find_in_local_clang_exception_projects,$(LOCAL_MODULE_MAKEFILE)),)
$(warning $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): warning: LOCAL_CLANG is set to false)
$(error $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): LOCAL_CLANG is set to false)
endif
endif

View file

@ -149,6 +149,7 @@ LOCAL_CLANG_EXCEPTION_PROJECTS = \
bionic/tests/ \
device/huawei/angler/ \
device/lge/bullhead/ \
external/gentoo/integration/ \
external/valgrind/ \
hardware/qcom/ \
$(INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS)