Merge "Define __ANDROID_API__ when building for the NDK."
diff --git a/core/binary.mk b/core/binary.mk
index 5750928..e71507c 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -309,7 +309,7 @@
# 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
diff --git a/core/clang/config.mk b/core/clang/config.mk
index b31e419..7113892 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -149,6 +149,7 @@
bionic/tests/ \
device/huawei/angler/ \
device/lge/bullhead/ \
+ external/gentoo/integration/ \
external/valgrind/ \
hardware/qcom/ \
$(INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS)